]> git.parisson.com Git - teleforma.git/commit
Merge branch 'pro' of git.parisson.com:git/teleforma into pro
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 17 Sep 2015 09:14:52 +0000 (11:14 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 17 Sep 2015 09:14:52 +0000 (11:14 +0200)
commit608efa63fe1c29af8bceb382bce61e046ec068d1
tree8d55148bdb8c972a5c57f6f85afe71ce5280efbf
parenta960b8f387fe3283afc04ef78cb9376d7fa822af
parentab123a8a998ce88c547a184b409bb3201de46671
Merge branch 'pro' of git.parisson.com:git/teleforma into pro

Conflicts:
teleforma/admin.py
teleforma/admin.py