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

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

Merge branch '0.9.x' into 1.0.x

Conflicts:
classes/Memcached_DataObject.php

EVENTS.txt	diff1 \|	diff2 \|	blob \| history
actions/showstream.php	diff1 \|	diff2 \|	blob \| history
classes/Memcached_DataObject.php	diff1 \|	diff2 \|	blob \| history
classes/Notice.php	diff1 \|	diff2 \|	blob \| history
classes/Notice_tag.php	diff1 \|	diff2 \|	blob \| history
classes/Profile.php	diff1 \|	diff2 \|	blob \| history
classes/User.php	diff1 \|	diff2 \|	blob \| history
db/statusnet.sql	diff1 \|	diff2 \|	blob \| history
lib/router.php	diff1 \|	diff2 \|	blob \| history
plugins/LdapCommon/LdapCommon.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. :-)

EVENTS.txt	diff1 \|	diff2 \|	blob \| history
actions/showstream.php	diff1 \|	diff2 \|	blob \| history
classes/Memcached_DataObject.php	diff1 \|	diff2 \|	blob \| history
classes/Notice.php	diff1 \|	diff2 \|	blob \| history
classes/Notice_tag.php	diff1 \|	diff2 \|	blob \| history
classes/Profile.php	diff1 \|	diff2 \|	blob \| history
classes/User.php	diff1 \|	diff2 \|	blob \| history
db/statusnet.sql	diff1 \|	diff2 \|	blob \| history
lib/router.php	diff1 \|	diff2 \|	blob \| history
plugins/LdapCommon/LdapCommon.php	diff1 \|	diff2 \|	blob \| history