]> 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: f619c3e d318b5c)
Merge remote-tracking branch 'upstream/master' into nightly
authorpostblue <postblue+git@postblue.info>
Fri, 23 Jan 2015 07:25:47 +0000 (08:25 +0100)
committerpostblue <postblue+git@postblue.info>
Fri, 23 Jan 2015 07:25:47 +0000 (08:25 +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. :-)