Merge branch 'test-3' into esi

Browse Source

# Conflicts:
#	eos/saveddata/character.py
#	service/character.py
#	service/eveapi.py
#	service/pycrest/eve.py

...

This commit is contained in:

blitzmann

2018-03-10 15:32:21 -05:00

parent fe1c4cc4d4 fac31f7254

commit 5560ef4d34

113 changed files with 846 additions and 379 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

service/eveapi.py Normal file