Merge branch 'feature/ordering-refactor' into develop

Browse Source

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

...

This commit is contained in:

Andy Miller

2017-03-22 12:09:15 -06:00

parent 5e4a829625 bf9dd97aee

commit 306f4cef16

15 changed files with 135 additions and 40 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