Gopesh Tulsyan 1421241df5 Merge 521d2dc72f into b64cc9f7e4		2014-03-17 15:35:34 +00:00
..
assets	Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions	2014-03-03 10:43:38 +01:00
controllers	Merge 521d2dc72f into b64cc9f7e4	2014-03-17 15:35:34 +00:00
helpers	Simplify sidebar and navigation	2014-03-04 10:10:07 +01:00
mailers	Fix bug in track list, also send accept/reject mails	2013-01-17 13:56:05 +01:00
models	Merge pull request #35 from differentreality/fix_conference_registration_after_questions	2014-03-17 16:34:30 +01:00
serializers	added Speaker#full_name to the JSON API	2013-07-22 11:54:27 +02:00
views	Merge 521d2dc72f into b64cc9f7e4	2014-03-17 15:35:34 +00:00