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
..
migrate	Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers	2014-03-03 10:52:24 +01:00
schema.rb	Updated the gems, add missing migration for the stats controller, fix most obvious issues with stats	2013-10-22 15:52:29 +02:00
seeds.rb	question builder	2014-02-09 18:05:57 +02:00