]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Sat, 27 Feb 2016 21:09:23 +0000 (22:09 +0100)
committerRoland Haeder <roland@mxchange.org>
Sat, 27 Feb 2016 21:09:23 +0000 (22:09 +0100)
commitd063afe10ecf85b31cc49a454ec8e664927c9e26
tree9f3baf7f29710e49d00ac76238126aa1091ba48d
parent44ebf768ba60377b29b6c765020410a0c115e91a
parent6336248d718fa35bc6766d6fcf031bfd1f8457c2
Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
12 files changed:
actions/foaf.php
actions/shownotice.php
classes/Notice.php
lib/attachmentlist.php
lib/default.php
lib/util.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/lib/salmonaction.php
plugins/OpenID/actions/openidserver.php
plugins/RegisterThrottle/RegisterThrottlePlugin.php
plugins/WebFinger/WebFingerPlugin.php