← Back to branch summary

~bloodearnest/canonical-identity-provider/juju-for-dev

~bloodearnest/canonical-identity-provider/juju-for-dev

Viewing all changes in revision 1320.

Committer: root
Date: 2015-09-28 09:22:15 UTC
mfrom: (1315.2.8 canonical-identity-provider)
Revision ID: root@admin.canonical.com-20150928092215-i7inieps9jshw51q

merging

files modified:
django_project/settings_base.py

django_project/settings_devel.py

po/api/api.pot

po/identityprovider/identityprovider.pot

po/webui/webui.pot

src/identityprovider/auth.py

src/identityprovider/tests/factory.py

src/identityprovider/tests/test_auth.py

Show diffs side-by-side

added added

removed removed

django_project/settings_base.py

django_project/settings_devel.py

po/identityprovider/identityprovider.pot

po/webui/webui.pot

src/identityprovider/auth.py

src/identityprovider/tests/factory.py

src/identityprovider/tests/test_auth.py

Older »