Matias Griese 830cd5c172 Merge branches 'develop' and 'feature/blueprints-update' of https://github.com/getgrav/grav into feature/blueprints-update ...

# Conflicts:
#	composer.lock

2016-03-01 21:14:21 +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

Restore old blueprints from develop

2016-03-01 19:14:11 +02: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 branches 'develop' and 'feature/blueprints-update' of https://github.com/getgrav/grav into feature/blueprints-update

2016-03-01 21:14:21 +02:00

defines.php

Bump Grav version constant to 1.1.0-beta, to make use of the new repo versioning

2016-02-29 16:15:43 +01:00