Merge branch 'develop' into 1.10

Browse Source

# Conflicts:
#	CHANGELOG.md
#	themes/grav/css-compiled/preset.css.map
#	themes/grav/css-compiled/template.css
#	themes/grav/css-compiled/template.css.map
#	themes/grav/templates/pages.html.twig

...

This commit is contained in:

Andy Miller

2019-10-23 15:25:38 -06:00

parent 41e376a7c7 c67be0e237

commit 55dda9d576

18 changed files with 136 additions and 29 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

36

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

File diff suppressed because one or more lines are too long