Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Tue, 10 Nov 2015 18:05:53 +0000 (19:05 +0100)
committerRoland Haeder <roland@mxchange.org>
Tue, 10 Nov 2015 18:05:53 +0000 (19:05 +0100)
commita0b9aeb43ef1b08e8dd7fe25101c515a0df53e7f
treec653b276e08b3e0e8e8d307486a4e866b9a5e16f
parent22f6cec9b7b9a04e61ba355730ffab9db9bc8005
parentdbdac9cfbe470d2742c3f8bf42145ff648cf12c9
Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
.gitignore
actions/doc.php
classes/Notice.php
lib/activity.php
lib/activityutils.php
lib/noticelistitem.php
plugins/Favorite/classes/Fave.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/FeedSub.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/WebFinger/WebFingerPlugin.php