]> 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: a1b1305 544e884)
Merge branch 'locshunt2' into 0.9.x
authorEvan Prodromou <evan@status.net>
Wed, 30 Dec 2009 18:57:39 +0000 (08:57 -1000)
committerEvan Prodromou <evan@status.net>
Wed, 30 Dec 2009 18:57:39 +0000 (08:57 -1000)
Conflicts:
classes/User_location_prefs.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. :-)