]> git.parisson.com Git - telemeta.git/commit
Merge remote-tracking branch 'origin' into demo
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 8 Jun 2016 22:36:32 +0000 (00:36 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 8 Jun 2016 22:36:32 +0000 (00:36 +0200)
commit55cf8cf68ddf023610806d12ef48ceb01ef9ca1d
tree16c6a8edb9e1c17060a356aaf8dec61c35be1091
parent4b635ec77a406f095328434db9ad288e0dbb9e81
parent4b04d999177972c063794160046e7a330267bc39
Merge remote-tracking branch 'origin' into demo

Conflicts:
telemeta/locale
docker-compose.yml