gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
osem-fcy/app/views/conference_registration
History
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
..
_questions.html.haml question builder 2014-02-09 18:05:57 +02:00
_registration.html.haml Volunteers, positions and days and volunteers list for admin, volunteering option for attendees 2014-01-01 11:39:59 +02:00
_volunteer.html.haml Volunteers, positions and days and volunteers list for admin, volunteering option for attendees 2014-01-01 11:39:59 +02:00
register.html.haml Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers 2014-03-03 10:52:24 +01:00