Merge branch 'develop' into 1.10

Browse Source

# Conflicts:
#	CHANGELOG.md
#	blueprints.yaml
#	themes/grav/js/admin.min.js

...

This commit is contained in:

Andy Miller

2019-08-21 15:13:17 -06:00

parent 62e0beb371 8bc3c855f1

commit 26e8192295

4 changed files with 17 additions and 6 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

4

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

File diff suppressed because one or more lines are too long