Merge branch 'master' into staging

Browse Source

# Conflicts:
#	CHANGELOG.md
#	fpakman/__init__.py
#	fpakman/view/qt/window.py

...

This commit is contained in:

Vinicius Moreira

2019-06-24 13:03:12 -03:00

parent 838b3fe903 f36991ea1f

commit d9d6e037b6

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