]> 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: c247b17 325199b)
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Sun, 1 Mar 2015 17:30:18 +0000 (18:30 +0100)
committerRoland Haeder <roland@mxchange.org>
Sun, 1 Mar 2015 17:30:18 +0000 (18:30 +0100)
Conflicts:
plugins/Blog/BlogPlugin.php
plugins/Blog/classes/Blog_entry.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. :-)