]> 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: 06aa05a ee23dc8)
Merge branch 'social-master' into nightly
authorRoland Haeder <roland@mxchange.org>
Sat, 7 Mar 2015 18:31:47 +0000 (19:31 +0100)
committerRoland Haeder <roland@mxchange.org>
Sat, 7 Mar 2015 18:31:47 +0000 (19:31 +0100)
Conflicts:
lib/noticeform.php

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