Merge branch 'develop' into 1.10

# Conflicts:
#	blueprints.yaml
This commit is contained in:
Andy Miller
2019-11-06 16:09:45 -07:00
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
themes/grav/.sass-cache
.DS_Store
crowdin.yaml
# Node Modules
**/node_modules/**

View File

@@ -114,7 +114,7 @@
* Fixed admin caching issues
# v1.9.11
## mm/dd/2019
## 10/06/2019
1. [](#improved)
* Added new "secure delete" functionality [#1752](https://github.com/getgrav/grav-plugin-admin/issues/1752)