]> git.parisson.com Git - teleforma.git/commit
projects / teleforma.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit999c15aee1aeceb04314ff930e4f27a8a291ca50
treed414ddea635ceca348625a7ce040ee1cafc753adtree | snapshot
parent5ff3df0e7f144836a4c7702564fef93000b87dc3commit | diff
parent2e8e64979245e9500e2131d0d32f039b6e738910commit | diff
Merge branch 'feature/full-subscribing' into dev

Conflicts:
teleforma/forms.py
teleforma/forms.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.