Vinicius Moreira 28d4dae56a Merge branch 'master' into staging ...

# Conflicts:
#	bauh/gems/appimage/controller.py
#	bauh/gems/arch/updates.py

2022-12-12 07:53:51 -03:00

..

core

Merge branch 'master' into staging

2022-12-12 07:53:51 -03:00

qt

Merge branch 'master' into staging

2022-12-12 07:53:51 -03:00

resources

[arch] refactoring: conflict resolution checking (+ test cases)

2022-11-20 11:13:54 -03:00

util

flake warnings (#304)

2022-12-12 07:44:27 -03:00

__init__.py

merge 'staging'

2019-08-12 17:29:33 -03:00