gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
osem-fcy/app/views/admin/conference
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
..
_sidebar.html.haml Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers 2014-03-03 10:52:24 +01:00
index.html.haml First checkin 2013-01-07 09:04:09 +01:00
new.html.haml First checkin 2013-01-07 09:04:09 +01:00
show.html.haml Add logo to conference page 2013-01-17 15:56:56 +01:00