Neerholt 3263663f3d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master ... Conflicts: skolehjem/app/Http/Controllers/EventController.php		2020-08-10 10:17:41 +02:00
..
admin	v0.5.14 - Fixed signups on event. Added en/dk versions. Added TinyMCEditor on events create/edit. Removed menuplans monday-thursday	2020-08-07 14:11:13 +02:00
app	Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master	2020-08-10 10:17:41 +02:00
user/layout	Fixes	2020-06-30 10:46:49 +02:00