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

# Conflicts:
#	system/src/Grav/Common/Data/Blueprint.php
#	system/src/Grav/Common/Data/Blueprints.php
#	system/src/Grav/Common/Data/Validation.php
#	system/src/Grav/Common/Plugins.php

2016-02-29 13:46:08 +02:00

..

config

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

2016-02-29 13:46:08 +02:00

media

Media Meta blueprint

2015-11-16 20:15:19 +01:00

pages

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

2016-02-29 13:46:08 +02:00

user

Various PSR fixes

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