Merge branch 'bug/phpinfo-accessible-hotfix' into develop
authorHypolite Petovan <hypolite@mrpetovan.com>
Tue, 8 Sep 2020 18:06:14 +0000 (14:06 -0400)
committerHypolite Petovan <hypolite@mrpetovan.com>
Tue, 8 Sep 2020 18:06:14 +0000 (14:06 -0400)
commitee8689cc899beecaf0943ac175550a7fb49cf199
tree230f66a21b2e44f48d480f5d33ec00b38621c276
parent3c29d2293e4da497e7f5eb9e799daeca41c2aba0
parent3efa8648c565f7a4bd24436a55336e7ca70fcb06
Merge branch 'bug/phpinfo-accessible-hotfix' into develop

# 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/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