]> git.parisson.com Git - telemeta.git/commit
projects / telemeta.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 370d58d 51ab1f2)
Merge branch 'feature/haystack' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 4 Feb 2016 14:42:35 +0000 (15:42 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 4 Feb 2016 14:42:35 +0000 (15:42 +0100)
commitc861d870f0451a1f6cc991067b7d00a8e447f8b1
tree4db077454125e2cbcceb70de86bc7aea0357a9f6tree | snapshot
parent370d58d2fd2b327d542855d49157e8f2c6864443commit | diff
parent51ab1f2eaf53175f3e271a4383b221fd8926e036commit | diff
Merge branch 'feature/haystack' into dev

Conflicts:
app/deploy/start_app.sh
README.rst diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.