projects / diaspy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2242284 c8e8dd7)
Merge branch 'master' of https://github.com/Javafant/diaspora-api
authorMarek Marecki <triviuss@gmail.com>
Fri, 24 May 2013 20:08:58 +0000 (22:08 +0200)
committerMarek Marecki <triviuss@gmail.com>
Fri, 24 May 2013 20:08:58 +0000 (22:08 +0200)

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