osem-fcy/config
Henne Vogelsang 14a896842b Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers
Conflicts:
	app/models/conference.rb
	app/models/registration.rb
	app/views/admin/conference/_sidebar.html.haml
	app/views/conference_registration/register.html.haml
2014-03-03 10:52:24 +01:00
..
environments Moved to the bootstrap-sass gem, lot's of styling issues fixed 2013-06-26 15:59:56 +02:00
initializers Fix sender email 2013-02-07 10:58:56 +01:00
locales Make the confirmation message clearer 2013-03-02 08:22:05 +01:00
application.rb Add 'revision' attribute to Conference, managed by an observer 2013-07-08 10:03:03 +02:00
boot.rb First checkin 2013-01-07 09:04:09 +01:00
config.yml.example * Add ID and track to the event overview 2013-06-14 13:17:40 +02:00
database.yml.example * Add ID and track to the event overview 2013-06-14 13:17:40 +02:00
deploy.rb First checkin 2013-01-07 09:04:09 +01:00
environment.rb First checkin 2013-01-07 09:04:09 +01:00
routes.rb Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers 2014-03-03 10:52:24 +01:00