From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 2 Jun 2017 13:54:05 +0000 (+0200)
Subject: Merge branch 'release/1.6.4' of github.com:Parisson/Telemeta into release/1.6.4
X-Git-Tag: search~2^2~6^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=52a18c70b9d06716db96b9656bfc4b7d3b7f8477;p=telemeta.git

Merge branch 'release/1.6.4' of github.com:Parisson/Telemeta into release/1.6.4

Conflicts:
	app/scripts/app.sh
---

52a18c70b9d06716db96b9656bfc4b7d3b7f8477
diff --cc .dockerignore
index a692b3d6,a692b3d6..af1ea76e
--- a/.dockerignore
+++ b/.dockerignore
@@@ -1,7 -1,7 +1,6 @@@
  .git
  *.pyc
  *.egg-info
--app/
  build/
  dist/
  data/