]> 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: c6b1e25 9c7b669)
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 28 Jun 2010 17:39:52 +0000 (13:39 -0400)
committerBrion Vibber <brion@pobox.com>
Mon, 28 Jun 2010 17:39:52 +0000 (13:39 -0400)
1  2 
lib/mediafile.php patch | diff1 | diff2 | blob | history

diff --cc lib/mediafile.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. :-)