]> git.parisson.com Git - mezzo.git/commit
resolve conficts
authorEmilie <zawadzki@ircam.fr>
Tue, 7 Feb 2017 17:21:05 +0000 (18:21 +0100)
committerEmilie <zawadzki@ircam.fr>
Tue, 7 Feb 2017 17:21:05 +0000 (18:21 +0100)
commit6cef4a014ff7643c1b17c46811ab0c092b4e4174
tree61cdf16e29c50ead7685b31013b4bc9530e181b3
parent7c62164bf8087e50b65b51ab65a82b047bed4ebe
parent884753c1636c47831646e73e1636a7a7975efeb8
resolve conficts
app/templates/base.html