]> git.parisson.com Git - mezzo.git/commit
resolve conflicts
authorEmilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 14:58:25 +0000 (15:58 +0100)
committerEmilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 14:58:25 +0000 (15:58 +0100)
commitec4b9022fd7ab98837b65dfb2e7d4a59cf424f9f
treeeaaa17ecb235b56e4456ae6d19b4d2ee5f5b76ed
parentae66f9bde45c68223fd665919d5ed7aad6ad01d8
parentad2d0274de1e4461015f41fcb5676a2cc018d09a
resolve conflicts
.gitignore
app/settings.py