]> git.parisson.com Git - telemeta.git/commit
Merge branch 'crem' of github.com:Parisson/Telemeta into crem
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Jan 2016 10:34:18 +0000 (11:34 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Jan 2016 10:34:18 +0000 (11:34 +0100)
commit8b3cb3eb2cd0401a1cce3e2d554b107abde823f5
tree23081d4a47263fb1644bd90973ac1c203ca6a04f
parentc02cb783d642622e6774f76daddb1a69ccaaa7b8
parentcdef5276a8de3356b26cfafe9e1b0c1d0a528475
Merge branch 'crem' of github.com:Parisson/Telemeta into crem

Conflicts:
telemeta/pages