]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 4 Nov 2016 21:40:09 +0000 (22:40 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 4 Nov 2016 21:40:09 +0000 (22:40 +0100)
1  2 
app/organization/network/admin.py

Simple merge