Andy Miller 7a393101ee Merge branch 'develop' into feature/v1.8 ...

# Conflicts:
#	CHANGELOG.md
#	composer.json
#	composer.lock
#	system/blueprints/config/system.yaml
#	system/src/Grav/Common/Twig/WriteCacheFileTrait.php

2023-05-12 13:44:07 -06:00

..

assets

css fix for phpdebugbar

2023-02-20 11:49:47 -07:00

blueprints

Merge branch 'develop' into feature/v1.8

2023-05-12 13:44:07 -06:00

config

Merge branch 'develop' into feature/v1.8

2023-05-12 13:44:07 -06: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' into feature/v1.8

2023-05-12 13:44:07 -06: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

2023-05-10 08:34:45 -06:00

install.php

Update copyright date

2023-01-02 11:09:32 -07:00

router.php

Update copyright date

2023-01-02 11:09:32 -07:00