Andy Miller e7721d21a2 Merge branch 'develop' into feature/lang_test ...

* develop:
  broke-out fallback into a protected method
  fix for content mismatch error
  add canonical routes like an alias
  add canonical route support

2015-06-30 16:56:04 -06:00

..

assets

Added initial named-assets implementation

2015-02-23 16:30:52 -07:00

blueprints

modular page cannot be added to root

2015-05-04 17:12:24 +02:00

config

lost default page timeout in last release.. resetting

2015-06-28 09:24:20 -06:00

images/media

fix for media thumbs

2014-08-11 12:32:34 -06:00

src/Grav

Merge branch 'develop' into feature/lang_test

2015-06-30 16:56:04 -06:00

tests

fixed problems with multiloading of includes

2014-09-14 23:08:56 +02:00

defines.php

version update

2015-06-22 17:10:24 -06:00