projects / diaspy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8e8dd7 62f1912)
Merge branch 'streams' of git://github.com/marekjm/diaspora-api into streams
authorMoritz Kiefer <moritz.kiefer@gmail.com>
Fri, 3 May 2013 08:23:12 +0000 (10:23 +0200)
committerMoritz Kiefer <moritz.kiefer@gmail.com>
Fri, 3 May 2013 08:23:12 +0000 (10:23 +0200)

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