Merge branch 'master' into gh-pages
Conflicts: docs/doctrees/environment.pickle docs/html/searchindex.js
Showing
File deleted
Please register or sign in to comment
Conflicts: docs/doctrees/environment.pickle docs/html/searchindex.js