Andy Miller f58cfd8571 Merge branch 'feature/blueprint-extend' into develop ...

Conflicts:
	system/blueprints/config/site.yaml
	system/blueprints/config/system.yaml

2015-07-28 18:36:02 -06:00

..

assets

And the actual jQuery file!

2015-07-05 14:52:48 -06:00

blueprints

Merge branch 'feature/blueprint-extend' into develop

2015-07-28 18:36:02 -06:00

config

typo

2015-07-24 08:20:46 -06:00

images/media

fix for media thumbs

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

languages

changed Inflector from static to class + added multilang support

2015-07-24 10:26:54 -06:00

src/Grav

Merge branch 'feature/blueprint-extend' into develop

2015-07-28 18:36:02 -06:00

tests

fixed problems with multiloading of includes

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

defines.php

version update

2015-07-21 13:48:00 -06:00