]> git.parisson.com Git - mezzo.git/commit
Merge branch 'orderable' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 18 Aug 2016 11:22:02 +0000 (13:22 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 18 Aug 2016 11:22:02 +0000 (13:22 +0200)
commitd34b01ac1a6a866e43940511c570f217f7180cb9
tree3d8afa2f8dc736b0b1bdede3912414d58d4ed4f4
parent641f0d0e6840f4679201a811ab10b6e3f871d809
parenta2e631a1d1073053ce041dec8661d868086e5e03
Merge branch 'orderable' into dev

Conflicts:
app/scripts/app.sh
app/organization/magazine/models.py
app/templates/base.html