Merge branch 'develop' (7.0.0) into master

# Conflicts: # .gitignore # .travis/linux_before_install.sh # docs/release_notes.rst # test_requirements.txt
2018-07-09 21:15:13 -07:00
parent 7795701595 316709c291
commit 5925ebe31c
286 changed files with 7002 additions and 4455 deletions
@@ -2,6 +2,7 @@
 *.pyc
 *.sublime-*
 venv*/
+.venv/
 pyvenv.cfg
 tasks.py
 .bash_history