Henne Vogelsang 243ea41456 Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions ... Conflicts: app/models/conference.rb config/routes.rb		2014-03-03 10:43:38 +01:00
..
admin	Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions	2014-03-03 10:43:38 +01:00
application	Adding and removing people	2013-07-10 16:13:53 +02:00
conference_registration	question builder	2014-02-09 18:05:57 +02:00
devise	Moved to the bootstrap-sass gem, lot's of styling issues fixed	2013-06-26 15:59:56 +02:00
home	Completely rework the navigation	2013-06-27 16:58:20 +02:00
layouts	show public name and email on top navbar	2013-07-29 08:59:40 +03: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