]> 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: f92fe73 f6432fd)
Merge branch 'nightly'
authorMikael Nordfeldth <mmn@hethane.se>
Sun, 5 Apr 2015 13:35:54 +0000 (15:35 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Sun, 5 Apr 2015 13:35:54 +0000 (15:35 +0200)
Conflicts:
INSTALL


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