From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 4 Mar 2015 10:35:21 +0000 (+0100)
Subject: Merge branch 'feature/docker-compose' into feature/wave
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ea83917a02e7142459da8b0f4342ba251a8bf38c;p=timeside.git

Merge branch 'feature/docker-compose' into feature/wave

Conflicts:
	timeside/server/templates/timeside/index.html
	timeside/server/templates/timeside/item_detail.html
---

ea83917a02e7142459da8b0f4342ba251a8bf38c