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

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

Merge commit 'origin/testing' into 0.9.x

Conflicts:
lib/action.php
lib/adminpanelaction.php

classes/File.php	diff1 \|	diff2 \|	blob \| history
classes/User.php	diff1 \|	diff2 \|	blob \| history
classes/User_group.php	diff1 \|	diff2 \|	blob \| history
index.php	diff1 \|	diff2 \|	blob \| history
lib/action.php	diff1 \|	diff2 \|	blob \| history
lib/adminpanelaction.php	diff1 \|	diff2 \|	blob \| history
lib/default.php	diff1 \|	diff2 \|	blob \| history
plugins/Facebook/FacebookPlugin.php	diff1 \|	diff2 \|	blob \| history
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. :-)

classes/File.php	diff1 \|	diff2 \|	blob \| history
classes/User.php	diff1 \|	diff2 \|	blob \| history
classes/User_group.php	diff1 \|	diff2 \|	blob \| history
index.php	diff1 \|	diff2 \|	blob \| history
lib/action.php	diff1 \|	diff2 \|	blob \| history
lib/adminpanelaction.php	diff1 \|	diff2 \|	blob \| history
lib/default.php	diff1 \|	diff2 \|	blob \| history
plugins/Facebook/FacebookPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/OStatusPlugin.php	diff1 \|	diff2 \|	blob \| history