You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
7 years ago
..
guest_credits.html Formatting 7 years ago
layout.html frontend stuff with babel and webpack 7 years ago
maintenance.html frontend stuff with babel and webpack 7 years ago
user_shifts.html shifts view: add button to collapse the filters 7 years ago