0xfff 87d05d09ce Merge branch 'feature/video-popup' ... * feature/video-popup: (Feature) Popup: Add video popup for the overview video # Conflicts: # _layouts/default.html # src/scss/main.scss		2016-09-17 02:33:55 +02:00
..
popup.js	(Feature) Popup: Add video popup for the overview video	2016-09-16 19:15:45 +02:00