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
..
admin	Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended	2013-07-16 15:59:00 +02:00
application	Adding and removing people	2013-07-10 16:13:53 +02:00
conference_registration	fix space	2013-07-11 07:45:16 +03:00
devise	Moved to the bootstrap-sass gem, lot's of styling issues fixed	2013-06-26 15:59:56 +02:00
home	Completely rework the navigation	2013-06-27 16:58:20 +02:00
layouts	Apply styles to all media	2013-07-15 12:22:57 +02:00
proposal	Merge pull request #13 from differentreality/event_registration	2013-07-11 02:47:32 -07:00
schedule	Do not use <br>	2013-07-15 12:22:07 +02:00
shared	Edit registration for admin	2013-07-12 13:37:30 +03:00