Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-12-30 12:20:49 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' into 1.9

Browse Source 
# Conflicts:
#	classes/admincontroller.php
#	themes/grav/js/admin.min.js
#	themes/grav/js/vendor.min.js
#	themes/grav/package-lock.json
This commit is contained in:
Andy Miller
2018-09-29 13:10:10 -06:00
parent b6c2dc6186 fe774c0014
commit f26a86429a
19 changed files with 826 additions and 8718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/admincontroller.php
View File

@@ -17,7 +17,7 @@ use Grav\Common\Page\Pages;
use Grav\Common\Page\Collection;
use Grav\Common\User\User;
use Grav\Common\Utils;
use Grav\Common\Backup\ZipBackup;
use Grav\Common\Backup\Backups;
use Grav\Plugin\Admin\Twig\AdminTwigExtension;
use Grav\Plugin\Login\TwoFactorAuth\TwoFactorAuth;
use Grav\Common\Yaml;