Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
symposion_app/symposion/sponsorship
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
..
management Fix flake8 warnings 2014-07-30 15:19:26 -03:00
templatetags Fix flake8 warnings 2014-07-30 15:19:26 -03:00
__init__.py updated project layout for 1.4 (without content changes) 2012-05-29 14:53:04 -04:00
admin.py Fix flake8 warnings 2014-07-30 15:19:26 -03:00
forms.py Fix flake8 warnings 2014-07-30 15:19:26 -03:00
managers.py first pass at merging pycon's sponsorship app with more basic symposion one 2012-07-12 15:17:49 -04:00
models.py Fix flake8 warnings 2014-07-30 15:19:26 -03:00
urls.py Fix flake8 warnings 2014-07-30 15:19:26 -03:00
views.py Merge pull request #49 from pyohio/pyohio-sponsorship-redirect 2014-07-31 23:37:34 -05:00