]> 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)
commit8e58c525f5bf2f0c0b10927ae220b69a61b1bd60
treeeaaa17ecb235b56e4456ae6d19b4d2ee5f5b76ed
parent75d0208cb26c6ff7ea13ff4188ded2d4913e9cd0
parent7c96e1bf5845988e74118cc03bd7a1c886b26090
resolve conflicts
.gitignore
app/settings.py