]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit5565216b42fc97d84c9602864b2095e557769717
tree321515410535f2bc3826fdbfce39d8f888556ab4tree | snapshot
parent96c6019638f6407b38fbc5a45485a3797af47adbcommit | diff
parent145a19954f6f993714cb8b65aaf9d54996503664commit | diff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

Conflicts:
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/OStatusPlugin.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)