Merge remote-tracking branch 'origin/master'

idlesign · Jan 13, 2019 · 504944b · 504944b
2 parents 2b034c6 + ec2eaf7
commit 504944b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/demo/requirements.txt b/demo/requirements.txt
@@ -1,2 +1,2 @@
-Django==2.1.1
-django-sitetree==1.11
+Django==2.1.2
+django-sitetree==1.11
diff --git a/sitetree/sitetreeapp.py b/sitetree/sitetreeapp.py
@@ -200,7 +200,7 @@ def register_dynamic_trees(trees, *args, **kwargs):
         trees = [trees]
         trees.extend(args)
 
-    for tree in trees:
+    for tree in trees or []:
         if tree is not None and tree['sitetrees'] is not None:
             if tree['tree'] is None:
                 # Register trees as they are defined in app.