Merge remote-tracking branch 'origin/development'

nsacyber · Jul 14, 2017 · c1c9d2c · c1c9d2c
2 parents 3aa5b4d + 03ebfde
commit c1c9d2c
Show file tree

Hide file tree

Showing 203 changed files with 1,378 additions and 5,819 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Walkoff apps can be found at: https://github.com/iadgov/WALKOFF-Apps
     * Can granularly configure which events to log on a per-case basis
 
 4. Drag and Drop Workflow Editor
-    * Makes creation and editing of workflows as easy as dragging and dropping capablities. 
+    * Makes creation and editing of workflows as easy as dragging and dropping capabilities.
 
 5. Flexible Workflow Execution
     * Manual Execution - Execute a workflow by pressing a button

diff --git a/apps/ARDrone/__init__.py b/apps/ARDrone/__init__.py
diff --git a/apps/ARDrone/api.yaml b/apps/ARDrone/api.yaml
diff --git a/apps/ARDrone/display.py b/apps/ARDrone/display.py
diff --git a/apps/ARDrone/interface/templates/index.html b/apps/ARDrone/interface/templates/index.html
diff --git a/apps/ARDrone/libardrone/.gitignore b/apps/ARDrone/libardrone/.gitignore