]> 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: 19df5c9 3b9b933)
Merge branch 'nightly' of https://git.gnu.io/gnu/gnu-social into nightly
authorvinzv <vinz@vinzv.de>
Fri, 2 Sep 2016 09:32:49 +0000 (11:32 +0200)
committervinzv <vinz@vinzv.de>
Fri, 2 Sep 2016 09:32:49 +0000 (11:32 +0200)
Conflicts:
lib/util.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. :-)