symposion_app/symposion/templates
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
..
boxes add default templates 2012-08-14 03:49:57 -04:00
cms Updated urls to 1.6 2014-07-05 16:46:01 +03:00
conference Updated urls to 1.6 2014-07-05 16:46:01 +03:00
emails Updated urls to 1.6 2014-07-05 16:46:01 +03:00
proposals Updated urls to 1.6 2014-07-05 16:46:01 +03:00
reviews Updated urls to 1.6 2014-07-05 16:46:01 +03:00
schedule Merge branch 'master' of https://github.com/KyivPy/symposion into KyivPy-master 2014-12-15 15:26:57 -06:00
sitetree add default templates 2012-08-14 03:49:57 -04:00
speakers Updated urls to 1.6 2014-07-05 16:46:01 +03:00
sponsorship Updated urls to 1.6 2014-07-05 16:46:01 +03:00
teams Updated urls to 1.6 2014-07-05 16:46:01 +03:00
dashboard.html Updated urls to 1.6 2014-07-05 16:46:01 +03:00