Matias Griese e7ddae713f Merge branch 'develop' of https://github.com/getgrav/grav into 1.6 ...

# Conflicts:
#	composer.json

2018-09-20 11:03:02 +03:00

..

assets

Test fixes for session/parsedown changes, jquery update, quark default theme

2018-03-09 12:45:27 -07:00

blueprints

Squashed commit of the following:

2018-09-19 15:44:31 -06:00

config

Squashed commit of the following:

2018-09-19 15:44:31 -06:00

images/media

Missing thumbnail throwing error when adding .json file via media

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

languages

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

2018-09-06 12:35:21 +03:00

pages

Refactored onPageNotFound event to fire after onPageInitialized

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

src/Grav

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

2018-09-20 11:03:02 +03:00

templates/partials

cleanup

2017-12-01 00:01:23 -07:00

defines.php

prepare for release

2018-08-23 13:02:37 -06:00

router.php

Transferred copyright

2017-12-11 15:08:05 -07:00