projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d26d83 d659e0a)
Merge branch 'master' into mmn_fixes
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 14 Dec 2015 21:01:50 +0000 (22:01 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Mon, 14 Dec 2015 21:01:50 +0000 (22:01 +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. :-)