Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
symposion_app/symposion
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
..
boxes Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 2014-12-15 15:15:46 -06:00
cms Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 2014-12-15 15:15:46 -06:00
conference Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 2014-12-15 15:15:46 -06:00
locale/en/LC_MESSAGES added source English PO 2014-07-31 14:54:10 -06:00
proposals Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 2014-12-15 15:15:46 -06:00
reviews Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 2014-12-15 15:15:46 -06:00
schedule Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 2014-12-15 15:15:46 -06:00
speakers Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 2014-12-15 15:15:46 -06:00
sponsorship Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 2014-12-15 15:15:46 -06:00
static add chosen 2012-08-31 02:31:31 -04:00
teams Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility 2014-12-15 15:15:46 -06:00
templates resolve merge conflict 2014-03-14 15:12:16 -04:00
utils Fix flake8 warnings 2014-07-30 15:19:26 -03:00
__init__.py bump version for dev 2013-03-14 04:56:04 -04:00
conf.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
markdown_parser.py Fix flake8 warnings 2014-07-30 15:19:26 -03:00
models.py add blank models.py to symposion 2012-08-14 04:20:46 -04:00
views.py Fix flake8 warnings 2014-07-30 15:19:26 -03:00