]> git.parisson.com Git - telemeta.git/commit
Merge branch 'release/1.6.4' of github.com:Parisson/Telemeta into release/1.6.4
authorThomas Fillon <thomas@parisson.com>
Fri, 2 Jun 2017 13:54:05 +0000 (15:54 +0200)
committerThomas Fillon <thomas@parisson.com>
Fri, 2 Jun 2017 13:54:05 +0000 (15:54 +0200)
commit52a18c70b9d06716db96b9656bfc4b7d3b7f8477
tree040133727741ccdb0eec6ac8411164e14c4b9e40
parent0bd7d58d354243634030efa8113a51c4b58889de
parent6a7fb7212b0a605990d7feb055193557df79b201
Merge branch 'release/1.6.4' of github.com:Parisson/Telemeta into release/1.6.4

Conflicts:
app/scripts/app.sh
.dockerignore