symposion_app Files · .tx/config · Conservancy Kallithea

Files @ cb4b0fac3871

Branch filter:

Location: symposion_app/.tx/config

cb4b0fac3871 195 B text/plain Show Annotation Show as Raw Download as Raw

Patrick Altman

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

[main]
host = https://www.transifex.com

[symposion.djangopo]
file_filter = symposion/locale/<lang>/LC_MESSAGES/django.po
source_lang = en
source_file = symposion/locale/en/LC_MESSAGES/django.po