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

..

migrate

Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions

2014-03-03 10:43:38 +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