Merge branch 'master' into lucid

Conflicts: integration_tests/workflow_tests/nested/submit.json
genome · Dec 9, 2015 · d5299ef · d5299ef
2 parents 226ae32 + 037fe28
commit d5299ef
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/integration_tests/workflow_tests/nested/submit.json b/integration_tests/workflow_tests/nested/submit.json
@@ -68,7 +68,7 @@
                                     "param": "inner_out_b"
                                 }
                             }
-                        ],
+                        ]
                     },
                     "service": "workflow",
                     "webhooks" : {