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

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
	actions/apitimelinetag.php

diff --cc actions/apitimelinetag.php
Simple merge

diff --cc plugins/DomainStatusNetwork/scripts/installforemail.php
index 1815b977596fe267ce731a1bf59a1de7b16a4040,f773094a74c426e9ccc023b43468d08e5a61cef2..1815b977596fe267ce731a1bf59a1de7b16a4040
mode 100644,100755..100755
--- 1/plugins/DomainStatusNetwork/scripts/installforemail.php
--- 2/plugins/DomainStatusNetwork/scripts/installforemail.php
+++ b/plugins/DomainStatusNetwork/scripts/installforemail.php

diff --cc plugins/DomainStatusNetwork/scripts/proposesite.php
index 28741a5d4fb94a6cca6630d26c525e038e94ba8a,96a722fdab775767ae943be3483be888905789eb..28741a5d4fb94a6cca6630d26c525e038e94ba8a
mode 100644,100755..100755
--- 1/plugins/DomainStatusNetwork/scripts/proposesite.php
--- 2/plugins/DomainStatusNetwork/scripts/proposesite.php
+++ b/plugins/DomainStatusNetwork/scripts/proposesite.php

diff --cc plugins/DomainStatusNetwork/scripts/sitefordomain.php
index 2eaa600d2598009bffb075811eaabbbc133fe8b6,59412ccebab6929169091d7ccddae77aa837d6b4..2eaa600d2598009bffb075811eaabbbc133fe8b6
mode 100644,100755..100755
--- 1/plugins/DomainStatusNetwork/scripts/sitefordomain.php
--- 2/plugins/DomainStatusNetwork/scripts/sitefordomain.php
+++ b/plugins/DomainStatusNetwork/scripts/sitefordomain.php

diff --cc plugins/EmailRegistration/scripts/cancelemailregistration.php
index 7ae81f7ccf8f48ead06666ce58052fa3c03817fc,d834aade600abdb032570d35fb9dc1f9b7bf5b36..7ae81f7ccf8f48ead06666ce58052fa3c03817fc
mode 100644,100755..100755
--- 1/plugins/EmailRegistration/scripts/cancelemailregistration.php
--- 2/plugins/EmailRegistration/scripts/cancelemailregistration.php
+++ b/plugins/EmailRegistration/scripts/cancelemailregistration.php

diff --cc plugins/EmailRegistration/scripts/registeremailuser.php
index a785a76a6649080aefba71cc0323ed8172971292,02915240d32d2e57b3abbff7f280e6dfd9256921..a785a76a6649080aefba71cc0323ed8172971292
mode 100644,100755..100755
--- 1/plugins/EmailRegistration/scripts/registeremailuser.php
--- 2/plugins/EmailRegistration/scripts/registeremailuser.php
+++ b/plugins/EmailRegistration/scripts/registeremailuser.php

diff --cc plugins/EmailReminder/scripts/sendemailreminder.php
index b126f9e049329cdd2f56834d9a8f8991b0d8ad8c,5b5b26dde38aa9a4d9a68e216336d64fd80a6dcc..b126f9e049329cdd2f56834d9a8f8991b0d8ad8c
mode 100644,100755..100755
--- 1/plugins/EmailReminder/scripts/sendemailreminder.php
--- 2/plugins/EmailReminder/scripts/sendemailreminder.php
+++ b/plugins/EmailReminder/scripts/sendemailreminder.php

diff --cc plugins/OStatus/scripts/fixup-shadow.php
index 817ef4eb166cc9f97225443fd57ac564e4a63bb2,ffaae5588d1eae757e07e15ac654f27056d168fc..817ef4eb166cc9f97225443fd57ac564e4a63bb2
mode 100644,100755..100755
--- 1/plugins/OStatus/scripts/fixup-shadow.php
--- 2/plugins/OStatus/scripts/fixup-shadow.php
+++ b/plugins/OStatus/scripts/fixup-shadow.php

diff --cc plugins/OStatus/scripts/gcfeeds.php
index f1db4b358ff35b0497457ad75ef27086a411ee30,a95cd54dbc8d8b636106e598a4ddeca56b7bcc62..f1db4b358ff35b0497457ad75ef27086a411ee30
mode 100644,100755..100755
--- 1/plugins/OStatus/scripts/gcfeeds.php
--- 2/plugins/OStatus/scripts/gcfeeds.php
+++ b/plugins/OStatus/scripts/gcfeeds.php

diff --cc plugins/OStatus/scripts/renew-feeds.php
index 01136de4173c5e04e871bc966d1b6deab49106fe,8f8ac3ee1d968416dacd8557e6e5fba7360181a4..01136de4173c5e04e871bc966d1b6deab49106fe
mode 100644,100755..100755
--- 1/plugins/OStatus/scripts/renew-feeds.php
--- 2/plugins/OStatus/scripts/renew-feeds.php
+++ b/plugins/OStatus/scripts/renew-feeds.php

diff --cc plugins/OStatus/scripts/resub-feed.php
index edf64cd5f6247c047dbe01c5c95bef1caab103a9,3d13724f7db1336979a951e6f5616c8bae1dba9a..edf64cd5f6247c047dbe01c5c95bef1caab103a9
mode 100644,100755..100755
--- 1/plugins/OStatus/scripts/resub-feed.php
--- 2/plugins/OStatus/scripts/resub-feed.php
+++ b/plugins/OStatus/scripts/resub-feed.php

diff --cc plugins/OStatus/scripts/rm_bad_feedsubs.php
index 1957f95cb368f3cafce9cf6b36ce25acbb156a25,ce1698a60c2bff4751a228127965bf6422e176e4..1957f95cb368f3cafce9cf6b36ce25acbb156a25
mode 100644,100755..100755
--- 1/plugins/OStatus/scripts/rm_bad_feedsubs.php
--- 2/plugins/OStatus/scripts/rm_bad_feedsubs.php
+++ b/plugins/OStatus/scripts/rm_bad_feedsubs.php

diff --cc plugins/OStatus/scripts/testfeed.php
index e22f22ac501abe91143dceac0141ed2cdfacfae5,84b470c3b251dbfc1f31bfe7823fa628d1657643..e22f22ac501abe91143dceac0141ed2cdfacfae5
mode 100644,100755..100755
--- 1/plugins/OStatus/scripts/testfeed.php
--- 2/plugins/OStatus/scripts/testfeed.php
+++ b/plugins/OStatus/scripts/testfeed.php

diff --cc plugins/OStatus/scripts/update-profile-data.php
index 772cc073e2f1a9af816aa658c1a9b3cdcd322ebb,e024ed95a780f3b09b8771f0d7360671b7303320..772cc073e2f1a9af816aa658c1a9b3cdcd322ebb
mode 100644,100755..100755
--- 1/plugins/OStatus/scripts/update-profile-data.php
--- 2/plugins/OStatus/scripts/update-profile-data.php
+++ b/plugins/OStatus/scripts/update-profile-data.php

diff --cc plugins/OStatus/scripts/update-profile.php
index 20073e0750ce2d92bc8195640023ad03689db3a1,3d726749202f82eb1471efc220b63899d174d076..20073e0750ce2d92bc8195640023ad03689db3a1
mode 100644,100755..100755
--- 1/plugins/OStatus/scripts/update-profile.php
--- 2/plugins/OStatus/scripts/update-profile.php
+++ b/plugins/OStatus/scripts/update-profile.php

diff --cc plugins/OStatus/scripts/update_ostatus_profiles.php
index 707dbe61f808d0c8c162843e589a23888d3f6c6e,2a32ae0491f5fc238a5da390ea842f10917d4f01..707dbe61f808d0c8c162843e589a23888d3f6c6e
mode 100644,100755..100755
--- 1/plugins/OStatus/scripts/update_ostatus_profiles.php
--- 2/plugins/OStatus/scripts/update_ostatus_profiles.php
+++ b/plugins/OStatus/scripts/update_ostatus_profiles.php

diff --cc plugins/OStatus/tests/slap.php
index eaef76d8cdeb1f1e2e59b5cb568f1b0856395268,e3f5439aed69bd239da22149538dfbbade619819..eaef76d8cdeb1f1e2e59b5cb568f1b0856395268
mode 100644,100755..100755
--- 1/plugins/OStatus/tests/slap.php
--- 2/plugins/OStatus/tests/slap.php
+++ b/plugins/OStatus/tests/slap.php

diff --cc plugins/Realtime/scripts/cleanupchannels.php
index b6035bfac56227814ffb7d0e3b8945577b8a861c,37883b1da65d41f013273b5f8cdc355432b64baa..b6035bfac56227814ffb7d0e3b8945577b8a861c
mode 100644,100755..100755
--- 1/plugins/Realtime/scripts/cleanupchannels.php
--- 2/plugins/Realtime/scripts/cleanupchannels.php
+++ b/plugins/Realtime/scripts/cleanupchannels.php

diff --cc plugins/RequireValidatedEmail/scripts/registerbyemail.php
index 6935e00ee5ff192073faf1faf3c99ba6ed5a1a5e,4d2000ab0fe714903549880f040c1f97dc77cad0..6935e00ee5ff192073faf1faf3c99ba6ed5a1a5e
mode 100644,100755..100755
--- 1/plugins/RequireValidatedEmail/scripts/registerbyemail.php
--- 2/plugins/RequireValidatedEmail/scripts/registerbyemail.php
+++ b/plugins/RequireValidatedEmail/scripts/registerbyemail.php

diff --cc plugins/Sitemap/scripts/updatecounts.php
index 744dab82876e816f023fe1cd0878873eb7855bfe,91bc0ac4e9720a23532973182c7bb749a06e1bb7..744dab82876e816f023fe1cd0878873eb7855bfe
mode 100644,100755..100755
--- 1/plugins/Sitemap/scripts/updatecounts.php
--- 2/plugins/Sitemap/scripts/updatecounts.php
+++ b/plugins/Sitemap/scripts/updatecounts.php

diff --cc plugins/TwitterBridge/daemons/twitterdaemon.php
index e563f534934ce2a4ce09c8eeaa99079a95b53e51,8b774889d19722214cea7595862bd8e8eb48359e..e563f534934ce2a4ce09c8eeaa99079a95b53e51
mode 100644,100755..100755
--- 1/plugins/TwitterBridge/daemons/twitterdaemon.php
--- 2/plugins/TwitterBridge/daemons/twitterdaemon.php
+++ b/plugins/TwitterBridge/daemons/twitterdaemon.php

diff --cc plugins/TwitterBridge/scripts/initialize_notice_to_status.php
index 12fb2457482399bdacc8662b95d5c781f34dbd08,f4a60c479d62498474f45710d7aae87535126b47..12fb2457482399bdacc8662b95d5c781f34dbd08
mode 100644,100755..100755
--- 1/plugins/TwitterBridge/scripts/initialize_notice_to_status.php
--- 2/plugins/TwitterBridge/scripts/initialize_notice_to_status.php
+++ b/plugins/TwitterBridge/scripts/initialize_notice_to_status.php

diff --cc scripts/clearcache.php
index 5904681edd8a7fbea0ad96b0e76373d37f09d6c4,c67d6275d89194cbcaf1641443e695a9ce14cd03..5904681edd8a7fbea0ad96b0e76373d37f09d6c4
mode 100644,100755..100755
--- 1/scripts/clearcache.php
--- 2/scripts/clearcache.php
+++ b/scripts/clearcache.php

diff --cc scripts/createsim.php
index e5b47df6dee7daf09c13f59de2c74ab82197c470,624043161da9f19fe0e3512e760e0f770e3f2ca4..e5b47df6dee7daf09c13f59de2c74ab82197c470
mode 100644,100755..100755
--- 1/scripts/createsim.php
--- 2/scripts/createsim.php
+++ b/scripts/createsim.php

diff --cc scripts/dumpschema.php
index 05638cda4cb22aed28c57fe79916a8c1b1814a49,9c5e3cf8b38c2fd9808803ba9c2c8437fcddfb89..05638cda4cb22aed28c57fe79916a8c1b1814a49
mode 100644,100755..100755
--- 1/scripts/dumpschema.php
--- 2/scripts/dumpschema.php
+++ b/scripts/dumpschema.php

diff --cc scripts/flushrouter.php
index a9952b4304fc2d4f01dd5cd03a25eff1b9d70205,51178a725c6d5acfb369cfcbebcb81387c897b75..a9952b4304fc2d4f01dd5cd03a25eff1b9d70205
mode 100644,100755..100755
--- 1/scripts/flushrouter.php
--- 2/scripts/flushrouter.php
+++ b/scripts/flushrouter.php

diff --cc scripts/flushsite.php
index 3950fb7cf71830b4b51b316bbf4606db130f8fca,b7f385ac45f8652990f2849904845726814c470e..3950fb7cf71830b4b51b316bbf4606db130f8fca
mode 100644,100755..100755
--- 1/scripts/flushsite.php
--- 2/scripts/flushsite.php
+++ b/scripts/flushsite.php

diff --cc scripts/gnusocialversion.php
index 91c2dc7f646ec759ddac1bff7008876fbccee86c,dbe9c54c5ba9d838787dc2affbc3afe0265585f2..91c2dc7f646ec759ddac1bff7008876fbccee86c
mode 100644,100755..100755
--- 1/scripts/gnusocialversion.php
--- 2/scripts/gnusocialversion.php
+++ b/scripts/gnusocialversion.php

diff --cc scripts/importtwitteratom.php
index d121179f47a9e45e0fa1777d0d9f9c29c419b499,a29526f27e1726f57f3679dcdab034fbf4350614..d121179f47a9e45e0fa1777d0d9f9c29c419b499
mode 100644,100755..100755
--- 1/scripts/importtwitteratom.php
--- 2/scripts/importtwitteratom.php
+++ b/scripts/importtwitteratom.php

diff --cc scripts/make-release.php
index a3d9c70eb061bdb435826dfc78bead11b27e92b3,157cae067db619a491c0ed9d8a07a8f8ae97f1a5..a3d9c70eb061bdb435826dfc78bead11b27e92b3
mode 100644,100755..100755
--- 1/scripts/make-release.php
--- 2/scripts/make-release.php
+++ b/scripts/make-release.php

diff --cc scripts/makegroupadmin.php
index 3d3b1d3e841accdfaddcbe98d3af8d091ed8a787,345d93c665745896d99c81e5d1623b56a2c3700f..3d3b1d3e841accdfaddcbe98d3af8d091ed8a787
mode 100644,100755..100755
--- 1/scripts/makegroupadmin.php
--- 2/scripts/makegroupadmin.php
+++ b/scripts/makegroupadmin.php

diff --cc scripts/registeruser.php
index b7ee9f368ca32aee845c4f429f18a966f5a87199,97caf645cd6eb812904d9c68da110e958e30ca49..b7ee9f368ca32aee845c4f429f18a966f5a87199
mode 100644,100755..100755
--- 1/scripts/registeruser.php
--- 2/scripts/registeruser.php
+++ b/scripts/registeruser.php

diff --cc scripts/sessiongc.php
index ef452fdb064f61847689f811368abcfb4d4fba47,af55ddf3f0d971d9c8af92636104c9527ecf4cb9..ef452fdb064f61847689f811368abcfb4d4fba47
mode 100644,100755..100755
--- 1/scripts/sessiongc.php
--- 2/scripts/sessiongc.php
+++ b/scripts/sessiongc.php

diff --cc scripts/settag.php
index 3c234f2c31cdc430321c17d4abd082c94476a00c,19abce43c8018a5d1de97ca83e5740f730c2c294..3c234f2c31cdc430321c17d4abd082c94476a00c
mode 100644,100755..100755
--- 1/scripts/settag.php
--- 2/scripts/settag.php
+++ b/scripts/settag.php

diff --cc scripts/showcache.php
index b4fe7b63ce9601b8c9d67648597a6bec63e1ce99,8ef08467d6be139dd2a50ee11670962cbeb30cf7..b4fe7b63ce9601b8c9d67648597a6bec63e1ce99
mode 100644,100755..100755
--- 1/scripts/showcache.php
--- 2/scripts/showcache.php
+++ b/scripts/showcache.php

diff --cc scripts/showtable.php
index 986260e1d23bdf8d16ac5ad2b425fae4217325a2,eb18a98e20d510cb3dfd2d8feee39abbd341dfd7..986260e1d23bdf8d16ac5ad2b425fae4217325a2
mode 100644,100755..100755
--- 1/scripts/showtable.php
--- 2/scripts/showtable.php
+++ b/scripts/showtable.php

diff --cc scripts/uncache_users.php
index 6cd2101ad7a4561378cf498456e99f569d3f25f3,b5955fd5aa9335a0ae259cdfb7baa24c3ea228bc..6cd2101ad7a4561378cf498456e99f569d3f25f3
mode 100644,100755..100755
--- 1/scripts/uncache_users.php
--- 2/scripts/uncache_users.php
+++ b/scripts/uncache_users.php

diff --cc scripts/updatelocation.php
index c8024cb769a86fb6d868e52c483b6ef9b9084063,abf9627cc71e6daffc61c3b26802b7a435bece14..c8024cb769a86fb6d868e52c483b6ef9b9084063
mode 100644,100755..100755
--- 1/scripts/updatelocation.php
--- 2/scripts/updatelocation.php
+++ b/scripts/updatelocation.php

diff --cc scripts/updateurls.php
index c49187c299407c194b27cb669f75ac3d395b3206,35b835e4944ac435ac24cf6dd43d5090efaa4932..c49187c299407c194b27cb669f75ac3d395b3206
mode 100644,100755..100755
--- 1/scripts/updateurls.php
--- 2/scripts/updateurls.php
+++ b/scripts/updateurls.php

diff --cc scripts/upgrade.php
index 0dd70f79f6fc6f6f3d4c9e6735f9ffa703da9855,126ef290360b27a7d8b0abfcf3963816555b18ef..0dd70f79f6fc6f6f3d4c9e6735f9ffa703da9855
mode 100644,100755..100755
--- 1/scripts/upgrade.php
--- 2/scripts/upgrade.php
+++ b/scripts/upgrade.php

diff --cc scripts/userrole.php
index a5eddeae5fc3dd5a1525ff6d12bdd2d1b4863b6e,d1061b18322417a6afb9c18e634dd5c6c467a78e..a5eddeae5fc3dd5a1525ff6d12bdd2d1b4863b6e
mode 100644,100755..100755
--- 1/scripts/userrole.php
--- 2/scripts/userrole.php
+++ b/scripts/userrole.php

diff --cc tests/atompub/atompub_test.php
index 4259c0cdc701dde222477542b0e59448e3395142,fb675c778e3c33754f7da53da80dd9c92806b973..4259c0cdc701dde222477542b0e59448e3395142
mode 100644,100755..100755
--- 1/tests/atompub/atompub_test.php
--- 2/tests/atompub/atompub_test.php
+++ b/tests/atompub/atompub_test.php

diff --cc tests/oauth/oauth_post_notice.php
index 6742ab1580b1dddd3c35772d70d878d6e2356bd8,23fc04b531567aedffc836627fc316eb7b563d88..6742ab1580b1dddd3c35772d70d878d6e2356bd8
mode 100644,100755..100755
--- 1/tests/oauth/oauth_post_notice.php
--- 2/tests/oauth/oauth_post_notice.php
+++ b/tests/oauth/oauth_post_notice.php