osem-fcy/app
Ancor Gonzalez Sosa 243f33ff91 Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended
Conflicts:
	app/controllers/admin/registrations_controller.rb
	app/models/registration.rb
2013-07-16 15:59:00 +02:00
..
assets First version of schedule printing style 2013-07-15 12:24:50 +02:00
controllers Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended 2013-07-16 15:59:00 +02:00
helpers fixes 2013-07-15 13:11:18 +03:00
mailers Fix bug in track list, also send accept/reject mails 2013-01-17 13:56:05 +01:00
models Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended 2013-07-16 15:59:00 +02:00
serializers json API for suseconferenceclient 2013-07-08 10:07:12 +02:00
views Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended 2013-07-16 15:59:00 +02:00