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
..
images	star voting system for proposals	2013-08-16 16:06:01 +03:00
javascripts	Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions	2014-03-03 10:43:38 +01:00
stylesheets	voting visual changes	2014-02-23 14:56:09 +02:00