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

..

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 branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions

2014-03-03 10:43:38 +01:00

helpers

Merge pull request #28 from differentreality/event_registration

2014-01-23 03:25:04 -08:00

mailers

Fix bug in track list, also send accept/reject mails

2013-01-17 13:56:05 +01:00

models

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

2014-03-03 10:43:38 +01:00

serializers

added Speaker#full_name to the JSON API

2013-07-22 11:54:27 +02:00

views

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

2014-03-03 10:43:38 +01:00