Merge branch 'master' into develop

2018-08-11 15:04:35 +02:00
parent a4f07953a8 b4feb09b7a
commit 2eea3c6ad6
45 changed files with 257 additions and 205 deletions
--- a/tests/nodes/io/test_json.py
+++ b/tests/nodes/io/test_json.py
@ -14,6 +14,7 @@ FOOBAZ = {"foo": "baz"}

 incontext = ConfigurableNodeTest.incontext

+
 ###
 # Standard JSON Readers / Writers
 ###