Files
Grav-Admin-Plugin/classes/plugin/AdminBaseController.php
Matias Griese be6428922d Merge branch 'develop' of github.com:getgrav/grav-plugin-admin into 1.10
 Conflicts:
	admin.php
	classes/plugin/AdminController.php
	composer.lock
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_psr4.php
	vendor/composer/autoload_real.php
	vendor/composer/autoload_static.php
	vendor/composer/installed.json
2020-12-01 09:24:05 +02:00

37 KiB