]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'nightly' of git.gnu.io:Quix0r/gnu-social into nightly nightly
authorRoland Haeder <roland@mxchange.org>
Tue, 26 May 2015 01:10:32 +0000 (03:10 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 26 May 2015 01:10:32 +0000 (03:10 +0200)
commitce6b98efce6ce2bd1ff4b26f38d1a9b668311c3d
tree735bb0637fec721e9e835a9e820c95e785d78ba8
parentd68b63820e4924bec76bcd84147b42030ac592b4
parentd010c5a5818a42610beb46faf93c83b4d1e25f2e
Merge branch 'nightly' of git.gnu.io:Quix0r/gnu-social into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
actions/showstream.php
lib/inlineattachmentlist.php
plugins/InfiniteScroll/InfiniteScrollPlugin.php
plugins/MobileProfile/MobileProfilePlugin.php
plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
16 files changed:
classes/File.php
classes/File_redirection.php
classes/File_thumbnail.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