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

# Conflicts:
#	CHANGELOG.md

2017-07-04 09:51:44 +03:00

..

assets

Add jQuery 3.x #1070

2016-10-03 17:18:00 +02:00

blueprints

Revert "Set folder name as required during validation [grav-plugin-admin#1146](https://github.com/getgrav/grav-plugin-admin/issues/1146)", was preventing validation

2017-06-30 10:40:49 +02:00

config

Added a tonne of new thumbs

2017-05-24 11:48:23 -06:00

images/media

Added a tonne of new thumbs

2017-05-24 11:48:23 -06:00

languages

Nicetime fix: 0 seconds from now -> just now (#1509)

2017-06-02 06:32:15 -06: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 2.0

2017-07-04 09:51:44 +03:00

defines.php

Prepare for release

2017-06-22 14:18:31 -06:00

router.php

Bump year

2017-05-05 17:21:59 +02:00