]> git.parisson.com Git - mezzo.git/commit
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)
commit1eaaf998f7ec27eabef8bf3e958bc0efe8cd7671
tree99c76b38fff058a5c693e8d1147e452260471d10
parentf73016a8f270d2db4f36b5463b663060f5009fc7
parent3eea940712ac99cfa9e2f8c1a35ecbc5f73df211
Merge branch 'staging' into dev

Conflicts:
app/festival/migrations/0001_initial.py
app/migrations/mezzanine_agenda/0002_auto_20160224_1142.py
requirements.txt