]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 18 Apr 2016 09:24:48 +0000 (11:24 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 18 Apr 2016 09:24:48 +0000 (11:24 +0200)
commit2b885bca82a49d8230f407cfff6f61a334ec4c9e
tree649c091e98bc15e64ff4d2f9143b5a16a7011ca0
parentbaea667b95889ab7fa4321d6683aec47ebef3326
parentaf533a2ac854de7f9aa96eba91253cd93049408c
Merge branch 'master' into dev

Conflicts:
telemeta/pages