]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ff3df0 2e8e649)
Merge branch 'feature/full-subscribing' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 3 Feb 2016 16:25:08 +0000 (17:25 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 3 Feb 2016 16:25:08 +0000 (17:25 +0100)
Conflicts:
teleforma/forms.py

1  2 
teleforma/forms.py patch | diff1 | diff2 | blob | history

diff --cc teleforma/forms.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.