Andy Miller d893dd55ff Merge branch 'develop' into 1.6 ...

# Conflicts:
#	.gitignore
#	bin/grav

2018-09-30 18:39:46 -06:00

..

composer.phar

Feature/scheduler (#2170)

2018-09-05 19:02:12 -06:00

gpm

New bin/gpm direct-install command (#1038)

2016-09-18 10:23:55 -06:00

grav

Merge branch 'develop' into 1.6

2018-09-30 18:39:46 -06:00

plugin

Revert "fire onPluginsInitialized event"

2018-05-08 09:48:56 -06:00