]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03651db cdc5e3d)
Merge branch 'feature/haystack' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 17 Apr 2015 16:24:09 +0000 (18:24 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 17 Apr 2015 16:24:09 +0000 (18:24 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.