]> 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: d72748e d3bbf3a)
Merge branch 'master' into testing
authorEvan Prodromou <evan@status.net>
Tue, 20 Oct 2009 20:11:07 +0000 (16:11 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 20 Oct 2009 20:11:07 +0000 (16:11 -0400)
Conflicts:
lib/util.php
tests/URLDetectionTest.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. :-)