Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	community/openbox/Packages-Mhwd
This commit is contained in:
Frede Hundewadt 2019-08-13 13:53:13 +02:00
commit ff713ddd8c
No known key found for this signature in database
GPG Key ID: 7605992471F3F073
1 changed files with 2 additions and 1 deletions

View File

@ -93,6 +93,7 @@ terminus-font
## Package management
#appimagelauncher
pamac
pamac-tray-appindicator
#pamac-cli
>extra apparmor
>extra snapd
@ -107,7 +108,7 @@ pamac
#octopi-repoeditor
#octopi-notifier-frameworks
#pamac-qt
#manjaro-application-utility
manjaro-application-utility
## Printing
>extra cups