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
..
_sidebar.html.haml	Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions	2014-03-03 10:43:38 +01:00
index.html.haml	First checkin	2013-01-07 09:04:09 +01:00
new.html.haml	First checkin	2013-01-07 09:04:09 +01:00
show.html.haml	Add logo to conference page	2013-01-17 15:56:56 +01:00