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

# Conflicts:
#	CHANGELOG.md
#	system/src/Grav/Common/Twig/TwigExtension.php

2017-08-29 08:56:04 +03:00

..

assets

Add jQuery 3.x #1070

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

blueprints

hilight for 2fa in account should be on true

2017-08-27 12:57:39 -06:00

config

Changing back the default redirect code from 301 to 302. (#1619)

2017-08-23 14:29:18 -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-08-29 08:56:04 +03:00

defines.php

Prepare for release

2017-08-16 11:05:12 -06:00

router.php

Bump year

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