]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorEmilie <zawadzki@ircam.fr>
Thu, 20 Oct 2016 15:08:49 +0000 (17:08 +0200)
committerEmilie <zawadzki@ircam.fr>
Thu, 20 Oct 2016 15:08:49 +0000 (17:08 +0200)
commit8ef9f537269aba1726261b9bb6e070c944e1d508
tree357268aaa3a93215c29ed10ef1f17ed892afb183
parent5ccc35bba01c9f9f67d436cd104fdecfc9288f22
parent224b68259196ba2ba00120118b15aa5e06ab3d57
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
app/local_settings.py
app/settings.py