Matias Griese 8c14a9907e Merge branch 'develop' of github.com:getgrav/grav into feature/v1.8 ... Conflicts: composer.lock		2022-08-18 13:27:06 +03:00
..
assets	updated jquery 3.x	2020-10-18 15:08:59 -06:00
blueprints	Merge branch 'develop' of github.com:getgrav/grav into feature/v1.8	2022-06-29 13:14:06 +03:00
config	Merge branch 'develop' of github.com:getgrav/grav into feature/v1.8	2022-06-29 13:14:06 +03:00
images	Watermark Media Action (#3308)	2021-10-21 06:31:33 -06:00
languages	Update es.yaml	2021-12-16 11:16:58 +02:00
pages	Do not cache 404 [#3025]	2020-10-05 11:16:17 +03:00
src	Merge branch 'develop' of github.com:getgrav/grav into feature/v1.8	2022-08-18 13:27:06 +03:00
templates	Fixed issue with content-security-policy not being properly supported with http-equiv + support single quotes	2021-02-08 11:45:22 -07:00
defines.php	prepare for release	2022-08-04 15:29:22 -06:00
install.php	updated copyright year	2022-01-03 09:14:00 -07:00
router.php	updated copyright year	2022-01-03 09:14:00 -07:00