git.mxchange.org Git - quix0rs-gnu-social.git/commit

]> git.mxchange.org Git - quix0rs-gnu-social.git/commit

Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
plugins/OpenID/openidserver.php (cleaned up mismatched comment)

classes/Notice.php	diff1 \|	diff2 \|	blob \| history
lib/apiaction.php	diff1 \|	diff2 \|	blob \| history
lib/atomgroupnoticefeed.php	diff1 \|	diff2 \|	blob \| history
lib/installer.php	diff1 \|	diff2 \|	blob \| history
plugins/OpenID/openidserver.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. :-)

classes/Notice.php	diff1 \|	diff2 \|	blob \| history
lib/apiaction.php	diff1 \|	diff2 \|	blob \| history
lib/atomgroupnoticefeed.php	diff1 \|	diff2 \|	blob \| history
lib/installer.php	diff1 \|	diff2 \|	blob \| history
plugins/OpenID/openidserver.php	diff1 \|	diff2 \|	blob \| history