]> git.parisson.com Git - telemeta.git/commit
Merge remote-tracking branch 'origin' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 10 Jun 2016 09:08:22 +0000 (11:08 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 10 Jun 2016 09:08:47 +0000 (11:08 +0200)
commite98b445ee3b2c02645800034c53971415e2abb4a
tree4e7f8183e2f27bb9e66a688b9048ea27e57705fc
parent9a1e8ccab6cde08f6d7e83db4a8cae33ef423e69
parente1042070feb0482c93b93bf80b5159da7c0bd1c3
Merge remote-tracking branch 'origin' into crem

Conflicts:
telemeta/locale
telemeta/pages
app/settings.py
docker-compose.yml
env/debug.env
env/prod.env