]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into feature/dj1.8
authorThomas Fillon <thomas@parisson.com>
Wed, 24 Aug 2016 13:57:29 +0000 (15:57 +0200)
committerThomas Fillon <thomas@parisson.com>
Wed, 24 Aug 2016 13:57:29 +0000 (15:57 +0200)
commit71f04af2ea6f01ea4d17e5e8da299d9197072015
treec42733450605edb29a14defab6a8e22747a3a4bb
parentd2f3ac91271708caecbfc0ff7fd3d552677d8e4b
parent6038c3b3cd2df2611425e79682cf2534584c5270
Merge branch 'dev' into feature/dj1.8

Conflicts:
app/settings.py
examples/sandbox/wsgi.py
setup.py
telemeta/locale
app/settings.py
setup.py
telemeta/models/location.py