marudor 71b41847e6 Merge remote-tracking branch 'origin/master' ... # Conflicts: # public/css/theme0.css # public/css/theme1.css # public/css/theme2.css # public/css/theme3.css # public/css/theme4.css # public/css/theme5.css # public/css/theme6.css		2018-02-08 22:57:41 +01:00
..
guest_credits.html	Formatting	2017-08-30 00:22:02 +02:00
layout.html	frontend stuff with babel and webpack	2018-01-03 01:19:31 +01:00
maintenance.html	frontend stuff with babel and webpack	2018-01-03 01:19:31 +01:00
user_shifts.html	shifts view: add button to collapse the filters	2018-01-01 22:16:41 +01:00