]> 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: 6dc0477 b0416ae)
Merge branch 'master' into mmn_fixes
authorMikael Nordfeldth <mmn@hethane.se>
Sat, 16 Jan 2016 23:41:43 +0000 (00:41 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sat, 16 Jan 2016 23:41:43 +0000 (00:41 +0100)

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