]> 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: 96c6019 145a199)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Sun, 21 Feb 2010 01:27:04 +0000 (20:27 -0500)
committerEvan Prodromou <evan@status.net>
Sun, 21 Feb 2010 01:27:04 +0000 (20:27 -0500)
Conflicts:
plugins/OStatus/OStatusPlugin.php

1  2 
plugins/OStatus/OStatusPlugin.php patch | diff1 | diff2 | blob | history

diff --cc plugins/OStatus/OStatusPlugin.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. :-)