]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7c0f32 5c6b98e)
Merge branch 'master' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Thu, 5 Mar 2015 21:04:51 +0000 (22:04 +0100)
committerRoland Haeder <roland@mxchange.org>
Thu, 5 Mar 2015 21:04:51 +0000 (22:04 +0100)
Conflicts:
README.md

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. :-)