]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into release/1.7
authorThomas Fillon <thomas@parisson.com>
Wed, 5 Jul 2017 19:33:47 +0000 (21:33 +0200)
committerThomas Fillon <thomas@parisson.com>
Wed, 5 Jul 2017 19:33:47 +0000 (21:33 +0200)
commit53620226e892299371b59e9a66cedfd79e78a093
treedcbf9ba872534649db31a3bb8be10464ced6a10d
parent2250a5bcbb569fc08342f24a82d20b7f208284f7
parenta6c56957076b1e66f1b5de5543a62c29fd4127b2
Merge branch 'dev' into release/1.7

Conflicts:
Dockerfile
Dockerfile