]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f73016a 3eea940)
Merge branch 'staging' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 25 Feb 2016 12:47:43 +0000 (13:47 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 25 Feb 2016 12:47:43 +0000 (13:47 +0100)
Conflicts:
app/festival/migrations/0001_initial.py
app/migrations/mezzanine_agenda/0002_auto_20160224_1142.py
requirements.txt


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.