Andy Miller 359c33dae5 Merge branch 'develop' into feature/alternative_debugger ...

Conflicts:
	system/src/Grav/Common/TwigExtension.php
	system/src/Grav/Console/Cli/InstallCommand.php
	system/src/Grav/Console/Cli/SandboxCommand.php

2014-10-28 15:56:01 -06: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

Tentatively added twig panel to debugbar - currently has issues with "processpage" twig calls used by modular

2014-10-22 21:14:11 -06:00

images/media

fix for media thumbs

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

src/Grav

Merge branch 'develop' into feature/alternative_debugger

2014-10-28 15:56:01 -06:00

defines.php

Prepearing for release

2014-10-10 14:02:01 -07:00