Matias Griese 5f76a0255c Merge branches 'develop' and 'feature/refactor' of https://github.com/getgrav/grav into feature/refactor ...

# Conflicts:
#	CHANGELOG.md
#	composer.lock

2015-11-23 09:48:30 +02:00

..

assets

And the actual jQuery file!

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

blueprints

Removed unused label

2015-11-19 20:05:29 -08:00

config

Don't set a default hash in system.yaml

2015-11-19 18:56:05 -07:00

images/media

fix for media thumbs

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

languages

Merge pull request #466 from tcsizmadia/develop

2015-11-22 16:32:57 +01:00

src/Grav

Merge branches 'develop' and 'feature/refactor' of https://github.com/getgrav/grav into feature/refactor

2015-11-23 09:48:30 +02:00

tests

fixed problems with multiloading of includes

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

defines.php

version update

2015-11-20 17:54:28 -07:00