blitzman 7115cd178c Merge branch 'development' into LogBook_v2 ...

Conflicts:
	config.py
	eos/saveddata/fit.py
	gui/bitmapLoader.py
	gui/graphFrame.py
	gui/utils/exportHtml.py
	pyfa.py
	service/crest.py
	service/price.py
	service/server.py

2017-02-25 18:21:07 -05:00

..

__init__.py

Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers

2017-02-11 11:51:53 -08:00

compat.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

errors.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

eve.py

Merge branch 'development' into LogBook_v2

2017-02-25 18:21:07 -05:00

weak_ciphers.py

Formatting and layout changes

2017-02-08 23:32:51 -08:00