From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 6 Mar 2015 19:57:30 +0000 (+0100)
Subject: Merge branch 'dev' into feature/wave
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=086b5637ace22c41c6d9875876afc4940748fa71;p=timeside.git

Merge branch 'dev' into feature/wave

Conflicts:
	timeside/server/management/commands/timeside-tests-boilerplate.py
---

086b5637ace22c41c6d9875876afc4940748fa71