]> 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: 9adbb49 0a19674)
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorBrion Vibber <brion@pobox.com>
Tue, 29 Mar 2011 23:26:20 +0000 (16:26 -0700)
committerBrion Vibber <brion@pobox.com>
Tue, 29 Mar 2011 23:26:20 +0000 (16:26 -0700)
Conflicts:
actions/apistatusesretweet.php
actions/repeat.php
classes/Notice.php
lib/command.php

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. :-)