Matias Griese 39d755c6a3 Merge branch 'develop' of github.com:getgrav/grav into feature/media ...

 Conflicts:

	CHANGELOG.md

	composer.lock

2022-03-23 16:06:39 +02:00

..

assets

updated jquery 3.x

2020-10-18 15:08:59 -06:00

blueprints

hash for multiavatar only

2022-03-08 14:00:06 -07:00

config

Update changelog + Accounts in sidebar

2022-03-08 10:45:44 -07: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/media

2022-03-23 16:06:39 +02: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-03-14 11:34:33 -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