]> git.parisson.com Git - telemeta.git/commit
Merge remote-tracking branch 'origin/master' into demo
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 25 Apr 2016 18:49:40 +0000 (20:49 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 25 Apr 2016 18:49:40 +0000 (20:49 +0200)
commit4b635ec77a406f095328434db9ad288e0dbb9e81
tree49d06028ba3410a8fbca6e15ffac44a01699c35e
parentd5b93d93d9b5c0e7fa2c4efa8d32c075c6cdafb9
parentf508cfc59b779520f1cc057049bbe8caa9a6a04d
Merge remote-tracking branch 'origin/master' into demo

Conflicts:
telemeta/pages
docker-compose.yml