Andy Miller 7aa930ca55 Merge branch '1.4' into develop ...

# Conflicts:
#	system/src/Grav/Common/Twig/TwigExtension.php
#	system/src/Grav/Common/Uri.php
#	tests/unit/Grav/Common/AssetsTest.php

2018-03-09 12:43:08 -07:00

..

assets

Slight change in Whoops colors

2018-01-19 10:31:33 -07:00

blueprints

Added Route overrides

2018-02-22 16:14:24 -07:00

config

Added new configuration option system.session.initialize to delay session initialization if needed by a plugin

2017-12-27 21:03:41 +02:00

images/media

Missing thumbnail throwing error when adding .json file via media

2017-09-25 13:21:15 -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 '1.4' into develop

2018-03-09 12:43:08 -07:00

templates/partials

cleanup

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

defines.php

Prepare for release

2018-02-15 15:53:36 -07:00

router.php

Transferred copyright

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