Vinicius Moreira 9f3c3fa5e8 Merge branch 'staging' into modules ...

# Conflicts:
#	fpakman/core/flatpak/controller.py
#	fpakman/core/flatpak/flatpak.py
#	fpakman/resources/locale/en
#	fpakman/resources/locale/es
#	fpakman/resources/locale/pt

2019-07-30 17:37:36 -03:00

3.5 KiB

Raw Blame History

View Raw