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

Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
actions/allrss.php
actions/deletenotice.php
actions/foaf.php
actions/groupbyid.php
actions/grouprss.php
actions/noticesearchrss.php
actions/oauthappssettings.php
actions/oauthconnectionssettings.php
actions/publicrss.php
actions/redirecturl.php
actions/repliesrss.php
actions/robotstxt.php
actions/tagrss.php
actions/userrss.php
classes/Notice.php
lib/rss10action.php
lib/settingsaction.php
plugins/Bookmark/actions/bookmarksrss.php
plugins/DirectMessage/actions/apidirectmessage.php
plugins/Directory/lib/sortablegrouplist.php
plugins/Directory/lib/sortablesubscriptionlist.php
plugins/ExtendedProfile/actions/profiledetail.php
plugins/FacebookBridge/actions/facebooksettings.php
plugins/Favorite/actions/favoritesrss.php
plugins/Favorite/actions/showfavorites.php
plugins/Gravatar/GravatarPlugin.php
plugins/ModLog/ModLogPlugin.php
plugins/SubMirror/actions/mirrorsettings.php
plugins/TwitterBridge/actions/twitterauthorization.php
plugins/TwitterBridge/actions/twitterlogin.php
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/lib/tweetinqueuehandler.php

author	Roland Haeder <roland@mxchange.org>
	Fri, 11 Sep 2015 16:51:23 +0000 (18:51 +0200)
committer	Roland Haeder <roland@mxchange.org>
	Fri, 11 Sep 2015 16:51:23 +0000 (18:51 +0200)
commit	7a106f6669a62e401fc0c4c09c6c6859328ec3a2
tree	cfbf714327c19adeb8aa4e0aba4cfe002a950a64	tree \| snapshot
parent	4694d068f965ec733edcfe5c9afe8244ae01f00a	commit \| diff
parent	a541533e043ba4e426237d4379ce089ea48a9b26	commit \| diff

actions/apitimelinetag.php	diff1 \|	diff2 \|	blob \| history
actions/foaf.php	diff1 \|	diff2 \|	blob \| history
actions/grouprss.php	diff1 \|	diff2 \|	blob \| history
actions/logout.php	diff1 \|	diff2 \|	blob \| history
actions/noticesearchrss.php	diff1 \|	diff2 \|	blob \| history
actions/publicrss.php	diff1 \|	diff2 \|	blob \| history
actions/recoverpassword.php	diff1 \|	diff2 \|	blob \| history
actions/replies.php	diff1 \|	diff2 \|	blob \| history
actions/robotstxt.php	diff1 \|	diff2 \|	blob \| history
actions/shownotice.php	diff1 \|	diff2 \|	blob \| history
actions/subscriptions.php	diff1 \|	diff2 \|	blob \| history
actions/tagrss.php	diff1 \|	diff2 \|	blob \| history
actions/userrss.php	diff1 \|	diff2 \|	blob \| history
classes/File_redirection.php	diff1 \|	diff2 \|	blob \| history
classes/Memcached_DataObject.php	diff1 \|	diff2 \|	blob \| history
classes/Notice.php	diff1 \|	diff2 \|	blob \| history
lib/action.php	diff1 \|	diff2 \|	blob \| history
lib/activityutils.php	diff1 \|	diff2 \|	blob \| history
lib/default.php	diff1 \|	diff2 \|	blob \| history
lib/formaction.php	diff1 \|	diff2 \|	blob \| history
lib/framework.php	diff1 \|	diff2 \|	blob \| history
lib/imagefile.php	diff1 \|	diff2 \|	blob \| history
lib/implugin.php	diff1 \|	diff2 \|	blob \| history
lib/installer.php	diff1 \|	diff2 \|	blob \| history
lib/noticelistitem.php	diff1 \|	diff2 \|	blob \| history
lib/personaltagcloudsection.php	diff1 \|	diff2 \|	blob \| history
lib/profileaction.php	diff1 \|	diff2 \|	blob \| history
lib/router.php	diff1 \|	diff2 \|	blob \| history
lib/tagcloudsection.php	diff1 \|	diff2 \|	blob \| history
lib/util.php	diff1 \|	diff2 \|	blob \| history
plugins/Activity/ActivityPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/BlogspamNet/BlogspamNetPlugin.php	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/BlogspamNet.pot	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/af/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ar/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/arz/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ast/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/be-tarask/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/bg/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ca/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/cs/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/da/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/el/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/en_GB/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/eo/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/eu/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/fa/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/fi/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/fur/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/gl/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/hsb/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/hu/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/id/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/is/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/it/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ja/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ka/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ko/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ksh/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/lb/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/lt/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/lv/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/mg/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ml/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ms/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/my/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ne/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/nn/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/pl/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/pt_BR/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/sr-ec/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/sv/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ta/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/te/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/tr/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/ur_PK/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/vi/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/BlogspamNet/locale/zh_TW/LC_MESSAGES/BlogspamNet.po	blob1 \|	blob2 \|	history
plugins/DirectMessage/actions/apidirectmessage.php	diff1 \|	diff2 \|	blob \| history
plugins/Directory/lib/sortablegrouplist.php	diff1 \|	diff2 \|	blob \| history
plugins/FacebookBridge/actions/facebookfinishlogin.php	diff1 \|	diff2 \|	blob \| history
plugins/Favorite/actions/showfavorites.php	diff1 \|	diff2 \|	blob \| history
plugins/Mapstraction/actions/map.php	diff1 \|	diff2 \|	blob \| history
plugins/ModLog/ModLogPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/OStatusPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/classes/Ostatus_profile.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/lib/magicenvelope.php	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/lib/salmonaction.php	diff1 \|	diff2 \|	blob \| history
plugins/OpenID/OpenIDPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/OpenID/openid.php	diff1 \|	diff2 \|	blob \| history
plugins/OpportunisticQM/lib/opportunisticqueuemanager.php	diff1 \|	diff2 \|	blob \| history
plugins/SearchSub/actions/searchsubs.php	diff1 \|	diff2 \|	blob \| history
plugins/TagSub/actions/tagsubs.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/TwitterBridgePlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/daemons/synctwitterfriends.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/daemons/twitterstatusfetcher.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/scripts/fakestream.php	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/scripts/streamtest.php	diff1 \|	diff2 \|	blob \| history
plugins/WebFinger/WebFingerPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/Xmpp/XmppPlugin.php	diff1 \|	diff2 \|	blob \| history