]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
authorJérémy Fabre <Jeremy@iMacdeJeremy2.fritz.box>
Wed, 15 Feb 2017 13:10:13 +0000 (14:10 +0100)
committerJérémy Fabre <Jeremy@iMacdeJeremy2.fritz.box>
Wed, 15 Feb 2017 13:10:13 +0000 (14:10 +0100)
commitcaf440b754a1a0673c47a429df1020d100de4658
treedfcb9eae66fc59cdd3f75400943f7937e96aac0e
parent7e0b136c7fc54ba42800851fa9e8667759a16ed3
parentb36b68726396790e919bf6ad26643e6d44191f5f
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

# Conflicts:
# app/templates/media/media/includes/media_card.html
app/templates/media/media/includes/media_card.html