Merge branch 'this-n-that' into wxPy-4.0.x

(cherry picked from commit 2e5430d57f)
This commit is contained in:
Robin Dunn
2018-05-07 11:22:08 -07:00
parent e64deef9d2
commit 09de554e1b
6 changed files with 64 additions and 16 deletions

1
.gitignore vendored
View File

@@ -62,3 +62,4 @@ mydbstub.py*
ubuntu-xenial-16.04-cloudimg-console.log
ubuntu-bionic-18.04-cloudimg-console.log
.pytest_cache