]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60c666a 0717c08)
Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
authorafilsaime <shadow_kungfu@hotmail.fr>
Mon, 8 Jun 2015 12:13:12 +0000 (14:13 +0200)
committerafilsaime <shadow_kungfu@hotmail.fr>
Mon, 8 Jun 2015 12:13:12 +0000 (14:13 +0200)

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