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
..
application.js	question builder	2014-02-09 18:05:57 +02:00
d3.v3.js	add d3 lib	2013-09-18 12:22:17 +03:00
d3.v3.min.js	add d3 lib	2013-09-18 12:22:17 +03:00
date.format.js	- Restructuring the assets	2013-01-11 15:00:54 +01:00
jquery-ui-timepicker-addon.js	Adding arrival/departure time to the registration form	2013-01-20 12:49:25 +01:00
jquery.dataTables.js	Working on the backend interface for supporter registrations	2013-02-03 18:12:44 +01:00
osem.js	voting visual changes	2014-02-23 14:56:09 +02:00
spectrum.js	- Restructuring the assets	2013-01-11 15:00:54 +01:00