Andy Miller a65c21acba Merge branch 'develop' into 1.7 ...

Signed-off-by: Andy Miller <rhuk@mac.com>

# Conflicts:
#	CHANGELOG.md
#	system/blueprints/config/system.yaml

2020-06-04 14:46:54 -06:00

..

assets

Upgraded jQuery to 3.4.1 - fixes #2859

2020-03-19 11:31:10 -06:00

blueprints

Merge branch 'develop' into 1.7

2020-06-04 14:46:54 -06:00

config

Merge branch 'develop' into 1.7

2020-06-04 14:46:54 -06:00

images/media

Missing thumbnail throwing error when adding .json file via media

2017-09-25 13:21:15 -06:00

languages

Update languages

2019-05-08 14:22:47 -06:00

pages

Refactored onPageNotFound event to fire after onPageInitialized

2016-09-08 12:30:34 -06:00

src/Grav

Merge branch 'develop' into 1.7

2020-06-04 14:46:54 -06:00

templates

Improved Flex to support custom site template paths

2019-10-10 16:16:54 +03:00

defines.php

prepare for rc.11 release

2020-05-14 15:47:01 -06:00

install.php

Updated copyright dates to 2020

2020-01-02 16:54:14 -07:00

router.php

Updated copyright dates to 2020

2020-01-02 16:54:14 -07:00