Vinicius Moreira 6723e6be65 Merge branch 'master' into staging ...

# Conflicts:
#	CHANGELOG.md
#	README.md
#	fpakman/__init__.py
#	fpakman/app.py
#	fpakman/core/controller.py
#	fpakman/core/flatpak.py
#	fpakman/core/model.py
#	fpakman/core/system.py
#	fpakman/resources/locale/en
#	fpakman/resources/locale/es
#	fpakman/resources/locale/pt
#	fpakman/view/qt/about.py
#	fpakman/view/qt/apps_table.py
#	fpakman/view/qt/history.py
#	fpakman/view/qt/systray.py
#	fpakman/view/qt/thread.py
#	fpakman/view/qt/window.py

2019-07-13 11:22:58 -03:00

..

img

0.3.0

2019-07-02 10:53:04 -03:00

locale

Merge branch 'master' into staging

2019-07-13 11:22:58 -03:00