]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Fri, 18 Dec 2015 20:55:25 +0000 (21:55 +0100)
committerRoland Haeder <roland@mxchange.org>
Fri, 18 Dec 2015 20:55:25 +0000 (21:55 +0100)
commit9b7773343460514c5c5811c9add5cd96a2770c42
treec9be31756041f4c667ecc7daffe44bd0acc73c63
parentf9ddb0e20919b1b22b1a78463ffb227a009c5614
parentbb0faaea56cef7eac51d80aaf2c4e0c90a0d92e2
Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
20 files changed:
actions/rsd.php
classes/File_redirection.php
classes/Notice.php
classes/User_group.php
lib/action.php
lib/default.php
lib/httpclient.php
lib/installer.php
lib/noticelistitem.php
lib/util.php
plugins/Autocomplete/actions/autocomplete.php
plugins/Event/EventPlugin.php
plugins/Linkback/LinkbackPlugin.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/Oembed/classes/File_oembed.php
plugins/TwitterBridge/TwitterBridgePlugin.php
scripts/setpassword.php
scripts/startdaemons.sh
scripts/stopdaemons.sh