projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d5443e f92fe73)
Merge branch 'master' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Fri, 27 Mar 2015 15:37:12 +0000 (16:37 +0100)
committerRoland Haeder <roland@mxchange.org>
Fri, 27 Mar 2015 15:37:12 +0000 (16:37 +0100)
Conflicts:
INSTALL

Signed-off-by: Roland Haeder <roland@mxchange.org>

Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)