Attachment upload skeleton works
Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Merge branch 'master', remote-tracking branch 'origin/master' into dev
Bugfixed and added delete feature to teamcalendar
Solve conflict
Started work with display_text for reservations. Some mystical bug in res saving. NEEEDS FIXING
stoof
Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Adds the displayname logic and changed the landing page for all usertypes
Conflict fix
Custom reservations done
Merge branch 'master', remote-tracking branch 'origin/master'
Merge branches 'master' and 'dev'