Merge branch 'develop' into feature/admin-gpm-dependencies

Browse Source

...

This commit is contained in:

Flavio Copes

2016-03-17 21:20:47 +01:00

parent ac4549eb5a 914a331cad

commit 2e8bf56bd8

11 changed files with 152 additions and 44 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

20

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

File diff suppressed because one or more lines are too long