projects / git-annex.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b701247 3097428)
Merge branch 'no-xmpp'
authorJoey Hess <joeyh@joeyh.name>
Wed, 28 Dec 2016 16:26:16 +0000 (12:26 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 28 Dec 2016 16:26:16 +0000 (12:26 -0400)

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