Merge branch 'bug/phpinfo-accessible-hotfix' into 2020.09-rc
authorHypolite Petovan <hypolite@mrpetovan.com>
Tue, 8 Sep 2020 18:07:46 +0000 (14:07 -0400)
committerHypolite Petovan <hypolite@mrpetovan.com>
Tue, 8 Sep 2020 18:07:46 +0000 (14:07 -0400)
commitfb7f7435c080e15bdafbbcbb5a3dfd94ef8dd952
tree879c1cc2e8bd3173f724bd53b203dba9da2e31f5
parentd15f52275248e231e1b839e173578d757e2a96c9
parent3efa8648c565f7a4bd24436a55336e7ca70fcb06
Merge branch 'bug/phpinfo-accessible-hotfix' into 2020.09-rc

# Conflicts:
# src/Module/Admin/DBSync.php
# src/Module/Admin/Logs/Settings.php
# src/Module/Admin/Themes/Details.php
# src/Module/Admin/Themes/Embed.php
src/Module/Admin/Addons/Index.php
src/Module/Admin/Blocklist/Contact.php
src/Module/Admin/Blocklist/Server.php
src/Module/Admin/Item/Delete.php
src/Module/Admin/Site.php
src/Module/Admin/Themes/Index.php
src/Module/Admin/Tos.php
src/Module/Admin/Users.php
src/Module/BaseAdmin.php
static/routes.config.php