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

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

projects / quix0rs-gnu-social.git / commit

author	Roland Haeder <roland@mxchange.org>
	Wed, 18 Feb 2015 15:47:11 +0000 (16:47 +0100)
committer	Roland Haeder <roland@mxchange.org>
	Wed, 18 Feb 2015 15:47:11 +0000 (16:47 +0100)
commit	c641aabd6f1d61320054238d7b136e9c7e315064
tree	31687640b1f704cd8d8f7671a29643f98b269e33	tree \| snapshot
parent	ad2dcde798df19510d88c028176742d68d3baa02	commit \| diff
parent	0acf3e0e30dbe9b127f5e307619e7ee72eb4e9cc	commit \| diff

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
actions/apifriendshipsdestroy.php
actions/apifriendshipsexists.php
actions/apifriendshipsshow.php
actions/apitimelineretweetedtome.php
plugins/Directory/actions/groupdirectory.php
plugins/Directory/actions/userdirectory.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

12 files changed:

This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)

RSS Atom

actions/apifriendshipsexists.php	diff1 \|	diff2 \|	blob \| history
actions/apifriendshipsshow.php	diff1 \|	diff2 \|	blob \| history
actions/apitimelineretweetedtome.php	diff1 \|	diff2 \|	blob \| history
actions/apitimelineuser.php	diff1 \|	diff2 \|	blob \| history
lib/activityimporter.php	diff1 \|	diff2 \|	blob \| history
lib/default.php	diff1 \|	diff2 \|	blob \| history
lib/installer.php	diff1 \|	diff2 \|	blob \| history
lib/util.php	diff1 \|	diff2 \|	blob \| history
plugins/Directory/actions/groupdirectory.php	diff1 \|	diff2 \|	blob \| history
plugins/Directory/actions/userdirectory.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/classes/Ostatus_profile.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/lib/salmonaction.php	diff1 \|	diff2 \|	blob \| history