Vinicius Moreira b5c93e68a7 Merge branch 'staging' into modules ...

# Conflicts:
#	fpakman/resources/locale/en
#	fpakman/resources/locale/es
#	fpakman/resources/locale/pt
#	fpakman/view/qt/apps_table.py

2019-08-01 14:42:44 -03:00

..

img

init

2019-07-26 19:03:23 -03:00

locale

Merge branch 'staging' into modules

2019-08-01 14:42:44 -03:00