Merge branch 'develop' of github.com:getgrav/grav-plugin-admin into develop

Browse Source

# Conflicts:
#	themes/grav/css-compiled/template.css.map

...

This commit is contained in:

Djamil Legato

2016-05-10 10:30:42 -07:00

parent 267a6ccdb1 856b991a5d

commit 462efc43cc

4 changed files with 42 additions and 18 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

themes/grav/js/admin.min.js vendored

File diff suppressed because one or more lines are too long