Matias Griese 2165ded8d4 Merge branch 'develop' of github.com:getgrav/grav into 1.7 ...

 Conflicts:

	system/src/Grav/Common/Page/Page.php

2020-02-10 17:42:21 +02:00

..

assets

updated JQuery

2019-10-30 21:50:20 -06:00

blueprints

Fixed FlexObject::triggerEvent() does not emit events [#2816]

2020-02-10 14:48:18 +02:00

config

Fixed system.translations: false breaking Inflector methods

2020-01-29 14:58:50 +02:00

images/media

…

languages

Update languages

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

pages

…

src/Grav

Merge branch 'develop' of github.com:getgrav/grav into 1.7

2020-02-10 17:42:21 +02:00

templates

Improved Flex to support custom site template paths

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

defines.php

prepare for rc.5 release

2020-02-03 12:36:15 -07: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