symposion_app/symposion/templates/schedule
Patrick Altman 2f89311d42 Merge branch 'master' of https://github.com/KyivPy/symposion into KyivPy-master
Conflicts:
	symposion/cms/urls.py
	symposion/proposals/urls.py
	symposion/proposals/views.py
	symposion/reviews/urls.py
	symposion/schedule/urls.py
	symposion/sponsorship/urls.py
2014-12-15 15:26:57 -06:00
..
_edit_grid.html Updated urls to 1.6 2014-07-05 16:46:01 +03:00
_grid.html Updated urls to 1.6 2014-07-05 16:46:01 +03:00
_slot_edit.html Updated urls to 1.6 2014-07-05 16:46:01 +03:00
presentation_detail.html Updated urls to 1.6 2014-07-05 16:46:01 +03:00
schedule_conference.html include section name in schedule view 2013-01-29 03:14:56 -05:00
schedule_detail.html use section name instead of section for box slugs 2013-01-29 06:11:34 -05:00
schedule_edit.html resolve merge conflict 2014-03-14 15:12:16 -04:00
schedule_list.html Updated urls to 1.6 2014-07-05 16:46:01 +03:00