Henne Vogelsang 14a896842b Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers ... Conflicts: app/models/conference.rb app/models/registration.rb app/views/admin/conference/_sidebar.html.haml app/views/conference_registration/register.html.haml		2014-03-03 10:52:24 +01:00
..
admin	Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers	2014-03-03 10:52:24 +01:00
application	Adding and removing people	2013-07-10 16:13:53 +02:00
conference_registration	Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers	2014-03-03 10:52:24 +01:00
devise	Volunteers, positions and days and volunteers list for admin, volunteering option for attendees	2014-01-01 11:39:59 +02:00
home	Completely rework the navigation	2013-06-27 16:58:20 +02:00
layouts	Volunteers, positions and days and volunteers list for admin, volunteering option for attendees	2014-01-01 11:39:59 +02:00
proposal	Add difficulty levels	2014-02-23 16:09:09 +02:00
schedule	show current day's schedule	2013-07-29 02:01:24 +03:00
shared	Edit registration for admin	2013-07-12 13:37:30 +03:00