]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Tue, 26 May 2015 17:57:09 +0000 (19:57 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 26 May 2015 17:57:09 +0000 (19:57 +0200)
commitd9b35208ecda59292680fb55e38c56b2831d5366
treecc0d7c428cc56c9064951614ca92453eff28c258
parentb6207009873b1bccdd8949d2d60234afbd16a084
parent6b717a6a6917bd024431f8d1e0835325e0194421
Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
lib/inlineattachmentlist.php
plugins/InfiniteScroll/InfiniteScrollPlugin.php
plugins/MobileProfile/MobileProfilePlugin.php
plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
14 files changed:
classes/File_redirection.php
lib/default.php
lib/framework.php
lib/inlineattachmentlist.php
lib/installer.php
lib/profileaction.php
lib/profilelist.php
lib/profileminilist.php
lib/schemaupdater.php
lib/util.php
plugins/MobileProfile/MobileProfilePlugin.php
plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
scripts/deleteprofile.php
scripts/upgrade.php