Merge pull request #319 from networktocode/release-2.2.0-to-develop

Release 2.2.0 to Develop

Author: jdrew82

.dockerignore

@@ -1,14 +1,3 @@
-<<<<<<< HEAD
-**/*.pyc
-**/*.pyo
-**/*.log
-.git/
-.gitignore
-Dockerfile
-docker-compose.yml
-.env
-docs/_build
-=======
 # Docker related
 development/Dockerfile
 development/docker-compose*.yml
@@ -36,4 +25,3 @@ LICENSE
 **/.vscode/
 invoke*.yml
 tasks.py
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)