Merge remote-tracking branch 'origin/master'

pylixm · Apr 13, 2020 · 5b63848 · 5b63848
2 parents 0b29767 + d0bf4fa
commit 5b63848
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/Pipfile b/Pipfile
@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-django = "==2.1.11"
+django = "==2.2.10"
 django-mdeditor = "*"
 
 [dev-packages]
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README_CN.md b/README_CN.md
@@ -190,6 +190,7 @@ admin.site.register(demo_models.ExampleModel, ExampleModelAdmin)
 在 `settings` 中增加如下配置 ：
 ```python
 MDEDITOR_CONFIGS = {
+'default':{
     'width': '90%',  # 自定义编辑框宽度
     'heigth': 500,   # 自定义编辑框高度
     'toolbar': ["undo", "redo", "|",
@@ -214,6 +215,7 @@ MDEDITOR_CONFIGS = {
     'watch': True,  # 实时预览
     'lineWrapping': False,  # 自动换行
     'lineNumbers': False  # 行号
+    }
 }
 ```