]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 18f4a7e d1a5a49)
Merge branch '0.8.x' into 0.9.x
authorEvan Prodromou <evan@status.net>
Sun, 4 Oct 2009 07:07:37 +0000 (03:07 -0400)
committerEvan Prodromou <evan@status.net>
Sun, 4 Oct 2009 07:07:37 +0000 (03:07 -0400)
commitc5047fd90ac8f6f057780a34065e320883c7a31f
tree01af92337e09496587020c49f7cafe0880ebdbbetree | snapshot
parent18f4a7eaea3c78cb55db843d77b43db86ac70308commit | diff
parentd1a5a4987514bc786eb270f0cc30300f7328a963commit | diff
Merge branch '0.8.x' into 0.9.x

Conflicts:
classes/Profile.php
classes/Profile.php diff1 | diff2 | blob | history
classes/User.php diff1 | diff2 | blob | history
lib/htmloutputter.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)