Merge branch 'master' into 'optimistic'
# Conflicts: # goblin/fileio/graphson.py
Showing
- .cz-config.js 49 additions, 0 deletions.cz-config.js
- .cz.json 1 addition, 0 deletions.cz.json
- .editorconfig 14 additions, 0 deletions.editorconfig
- .gitattributes 4 additions, 0 deletions.gitattributes
- .gitlab-ci.yml 9 additions, 3 deletions.gitlab-ci.yml
- .travis.yml 0 additions, 26 deletions.travis.yml
- CHANGELOG.md 6 additions, 0 deletionsCHANGELOG.md
- CODE_OF_CONDUCT.md 72 additions, 0 deletionsCODE_OF_CONDUCT.md
- CONTRIBUTING.md 97 additions, 0 deletionsCONTRIBUTING.md
- CONTRIBUTORS.md 4 additions, 0 deletionsCONTRIBUTORS.md
- LICENSE 199 additions, 10 deletionsLICENSE
- NEWS.txt 0 additions, 8 deletionsNEWS.txt
- NOTICE 13 additions, 5 deletionsNOTICE
- README.md 49 additions, 10 deletionsREADME.md
- goblin/fileio/graphson.py 2 additions, 2 deletionsgoblin/fileio/graphson.py
- goblin/session.py 3 additions, 2 deletionsgoblin/session.py
- requirements.txt 12 additions, 10 deletionsrequirements.txt
- setup.cfg 2 additions, 1 deletionsetup.cfg
- setup.py 2 additions, 2 deletionssetup.py
- tests/test_graph.py 4 additions, 4 deletionstests/test_graph.py
Loading
Please register or sign in to comment