Andy Miller aae644ca33 Merge branch 'feature/introduce_phpunit' of https://github.com/rindeal/grav into rindeal-feature/introduce_phpunit ...

Conflicts:
	composer.json

2015-01-19 15:21:10 -07:00

..

assets

other css tweaks

2014-10-19 18:47:14 -07:00

blueprints

fix for username field

2014-10-12 13:49:20 -06:00

config

Cherry-pick of #112

2015-01-16 14:44:25 -08:00

images/media

fix for media thumbs

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

src/Grav

minor perf optimizations

2015-01-19 15:16:36 -07:00

tests

fixed problems with multiloading of includes

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

defines.php

Fix fixed path in theme_url Twig variable

2015-01-10 17:55:28 +02:00