]> 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: 8d26d83 edd62e5)
Merge branch 'master' into nightly
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 14 Dec 2015 21:03:04 +0000 (22:03 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Mon, 14 Dec 2015 21:03:04 +0000 (22:03 +0100)
1  2 
lib/util.php patch | diff1 | diff2 | blob | history

diff --cc lib/util.php
Simple 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. :-)