Djamil Legato f5e1ea01f2 Merge remote-tracking branch 'origin/develop' into feature/es6_revamp ...

# Conflicts:
#	themes/grav/css-compiled/template.css
#	themes/grav/css-compiled/template.css.map
#	themes/grav/scss/template/_editor.scss
#	themes/grav/scss/template/_forms.scss
#	themes/grav/scss/template/_remodal.scss
#	themes/grav/templates/partials/base.html.twig
#	themes/grav/templates/partials/dashboard-statistics.html.twig

2016-03-02 11:13:06 -08:00

..

admin.php

Add dependencies() method in Admin

2016-03-01 19:52:24 +01:00

controller.php

Merge remote-tracking branch 'origin/develop' into feature/es6_revamp

2016-03-02 11:13:06 -08:00

gpm.php

Lint gpm

2016-03-01 19:50:12 +01:00

popularity.php

Merge remote-tracking branch 'origin/develop' into feature/es6_revamp

2016-02-09 13:04:16 -08:00

themes.php

Add onAdminThemeInitialized event into admin Themes::init()

2015-12-02 17:22:48 +02:00