]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Fri, 2 Sep 2016 19:08:17 +0000 (21:08 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 2 Sep 2016 19:08:17 +0000 (21:08 +0200)
commit4d76aa8db80b4ee0ec717ceb81ce4ae2fbfb57b7
tree28fef19ad2ee2dd4950295100bc090c12ea10b3f
parentd063afe10ecf85b31cc49a454ec8e664927c9e26
parent18670c69b27e499b2d84efd48185624d223027b9
Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
14 files changed:
actions/apisearchatom.php
actions/apitimelinefriends.php
classes/Notice.php
lib/action.php
lib/activity.php
lib/installer.php
lib/noticelistitem.php
lib/searchaction.php
lib/util.php
plugins/BitlyUrl/BitlyUrlPlugin.php
plugins/Mapstraction/MapstractionPlugin.php
plugins/OStatus/lib/magicenvelope.php
plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php
plugins/Sitemap/SitemapPlugin.php