Merge branch 'master' into development

Browse Source

Conflicts:
	config.py
	gui/utils/exportHtml.py

...

This commit is contained in:

blitzman

2017-02-26 14:28:46 -05:00

parent 1826122381 821298b6d0

commit 5283c50f84

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

Diff Content Not Available