merged qa into codeocean

2015-03-27 21:27:40 +01:00
parent de154a6f66
commit bad98cca1d
5 changed files with 194 additions and 92 deletions
--- a/config/code_ocean.yml.travis
+++ b/config/code_ocean.yml.travis
@@ -1,3 +1,5 @@
 test:
  flowr:
    enabled: false
+  code_pilot:
+    enabled: false