From: Guillaume Pellerin Date: Wed, 3 Feb 2016 16:25:08 +0000 (+0100) Subject: Merge branch 'feature/full-subscribing' into dev X-Git-Tag: 1.1~163 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=999c15aee1aeceb04314ff930e4f27a8a291ca50;p=teleforma.git Merge branch 'feature/full-subscribing' into dev Conflicts: teleforma/forms.py --- 999c15aee1aeceb04314ff930e4f27a8a291ca50