]> 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: 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)
Conflicts:
classes/Avatar.php

I ignored the code in Avatar; it's a different patch.

1  2 
plugins/BitlyUrl/BitlyUrlPlugin.php patch | diff1 | diff2 | blob | history

diff --cc plugins/BitlyUrl/BitlyUrlPlugin.php
Simple 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. :-)