]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6dd0f4f 1c4de8f)
Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
authorKaltar5679 <killian.mary@outlook.fr>
Wed, 10 Jun 2015 14:01:15 +0000 (16:01 +0200)
committerKaltar5679 <killian.mary@outlook.fr>
Wed, 10 Jun 2015 14:01:15 +0000 (16:01 +0200)

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