]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7d64d8c e25400b)
Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline...
authorEvan Prodromou <evan@status.net>
Wed, 21 Sep 2011 19:39:44 +0000 (15:39 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 21 Sep 2011 19:39:44 +0000 (15:39 -0400)
commit59043dca7fb6f974b11797c4d0f20e5b78b0611d
tree5e807fa94f322ba2e5a2b3814df890deae0705e9tree | snapshot
parent7d64d8c78cfa102b91975598ef9e574d2ef14b8ccommit | diff
parente25400b4f21b3cc83ff82b71050766df070e4b5dcommit | diff
Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline into merge-requests/164

Conflicts:
classes/Avatar.php

I ignored the code in Avatar; it's a different patch.
plugins/BitlyUrl/BitlyUrlPlugin.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. :-)