]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 540c545 efb7d28)
Merge commit 'refs/merge-requests/158' of git://gitorious.org/statusnet/mainline...
authorEvan Prodromou <evan@status.net>
Mon, 26 Sep 2011 21:11:49 +0000 (17:11 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 26 Sep 2011 21:11:49 +0000 (17:11 -0400)
commit8c710ad2c1b80544acccb515f7b601aadff2de16
tree0d07297a275e683dcc2f31f6481f4b992899b8datree | snapshot
parent540c54539906c8bbf9b16c4cc0dd9365e221487dcommit | diff
parentefb7d28d830b1057cc0e57496dcb263955bbb358commit | diff
Merge commit 'refs/merge-requests/158' of git://gitorious.org/statusnet/mainline into merge-requests/158

Conflicts:
classes/Profile_list.php
lib/peopletagnoticestream.php
classes/Profile_list.php diff1 | diff2 | blob | history
classes/Profile_tag.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. :-)