Andy Miller f9fcdd6c51 Revert "simplify asset collections in a single array" ...

This reverts commit 756b088ada.

# Conflicts:
#	system/src/Grav/Common/Assets.php

2022-01-09 21:12:39 -07:00

..

assets

updated jquery 3.x

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

blueprints

initial js module support in assets

2022-01-09 13:29:40 -07:00

config

initial js module support in assets

2022-01-09 13:29:40 -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

Revert "simplify asset collections in a single array"

2022-01-09 21:12:39 -07: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-01-04 11:01:21 -07: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