]> 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: a05e674 a21a172)
Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Wed, 14 Apr 2010 09:15:21 +0000 (11:15 +0200)
committerBrion Vibber <brion@pobox.com>
Wed, 14 Apr 2010 09:15:21 +0000 (11:15 +0200)
1  2 
classes/Notice.php patch | diff1 | diff2 | blob | history

diff --cc classes/Notice.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. :-)