Matias Griese afd680b133 Merge branch 'develop' of https://github.com/getgrav/grav into feature/blueprints-update ...

# Conflicts:
#	composer.lock

2016-02-12 09:32:24 +02:00

..

assets

🚧 Rename jquery-2.2.0.min.js to jquery-2.x.min.js

2016-01-26 13:24:29 +01:00

blueprints

Merge branch 'develop' into feature/blueprints-update

2016-02-11 20:10:06 +01:00

config

Various PSR fixes

2016-02-05 12:39:04 -07:00

images/media

Add empty thumb.png image as default

2015-12-23 16:30:12 +01:00

languages

Fix languages in Grav

2016-02-11 16:27:34 +01:00

src/Grav

Merge branch 'develop' of https://github.com/getgrav/grav into feature/blueprints-update

2016-02-12 09:32:24 +02:00

defines.php

version update

2016-02-11 15:37:14 -07:00