Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
symposion_app/symposion/proposals
History
Patrick Altman cb4b0fac38 Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 
Conflicts:
	symposion/boxes/urls.py
	symposion/cms/urls.py
	symposion/conference/urls.py
	symposion/proposals/models.py
	symposion/proposals/urls.py
	symposion/reviews/urls.py
	symposion/schedule/models.py
	symposion/schedule/urls.py
	symposion/speakers/urls.py
	symposion/sponsorship/urls.py
	symposion/teams/urls.py
2014-12-15 15:15:46 -06:00
..
templatetags Fix flake8 warnings 2014-07-30 15:19:26 -03:00
__init__.py add proposals app from pycon 2012-07-12 00:38:39 -04:00
actions.py Fix flake8 warnings 2014-07-30 15:19:26 -03:00
admin.py add proposals app from pycon 2012-07-12 00:38:39 -04:00
forms.py Fix flake8 warnings 2014-07-30 15:19:26 -03:00
models.py Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 2014-12-15 15:15:46 -06:00
urls.py Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 2014-12-15 15:15:46 -06:00
views.py Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 2014-12-15 15:15:46 -06:00