symposion_app/symposion/cms
Patrick Altman 67433cacb4 Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all
Conflicts:
	symposion/boxes/models.py
	symposion/conference/models.py
	symposion/schedule/models.py
	symposion/speakers/models.py
	symposion/sponsorship/admin.py
	symposion/sponsorship/models.py
	symposion/teams/models.py
2015-09-08 15:07:24 -05:00
..
__init__.py Namespace the apps 2014-12-18 08:19:01 -06:00
admin.py Fix flake8 warnings 2014-07-30 15:19:26 -03:00
apps.py Namespace the apps 2014-12-18 08:19:01 -06:00
forms.py Fix flake8 warnings 2014-07-30 15:19:26 -03:00
managers.py Use timezone.now instead of datetime.now 2014-12-18 08:19:01 -06:00
models.py Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all 2015-09-08 15:07:24 -05:00
urls.py Merge branch 'master' of https://github.com/KyivPy/symposion into KyivPy-master 2014-12-15 15:26:57 -06:00
views.py Fix flake8 warnings 2014-07-30 15:19:26 -03:00