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

60 KiB

Raw Blame History

View Raw