]> 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: 48f8f3f c81cd18)
Merge branch 'master' into nightly
authorMikael Nordfeldth <mmn@hethane.se>
Fri, 27 Feb 2015 09:01:55 +0000 (10:01 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Fri, 27 Feb 2015 09:01:55 +0000 (10:01 +0100)
Conflicts:
lib/apiaction.php


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