Merge remote-tracking branch 'origin/master'

# Conflicts:
#	community/openbox/Packages-Desktop
This commit is contained in:
Frede Hundewadt 2018-11-16 09:56:06 +01:00
commit 411d1daa91
No known key found for this signature in database
GPG Key ID: 7605992471F3F073
1 changed files with 1 additions and 0 deletions

View File

@ -190,6 +190,7 @@ manjaro-openbox-desktop-settings
manjaro-grub-theme-brown
manjaro-slick-greeter-theme-brown
manjaro-openbox-scripts
manjaro-openbox-wallpapers
#---------=> theme meta package
# metapkg: manjaro-openbox-theme-18.0