Merge branch 'master' of https://gitlab.manjaro.org/profiles-and-settings/iso-profiles

community/lxde/Packages-Desktop

@@ -103,6 +103,7 @@ gnome-themes-standard
 hicolor-icon-theme
 manjaro-lxde-logout-banner
 manjaro-lxde-settings-dev
+manjaro-zsh-config
 ttf-dejavu
 ttf-roboto
 

community/lxqt/Packages-Desktop

@@ -137,6 +137,7 @@ manjaro-icons
 manjaro-openbox-adapta-maia
 manjaro-openbox-grub-theme-glassfield
 manjaro-wallpapers-18.0
+manjaro-zsh-config
 papirus-maia-icon-theme
 xcursor-breeze
 

shared/Packages-Root

@@ -1,4 +1,5 @@
 acpi
+amd-ucode
 >i686 archlinux32-keyring
 b43-fwcutter
 bash

shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc

@@ -4,10 +4,10 @@ componentName:  manjaro
 strings:
     productName:         Manjaro Linux
     shortProductName:    Manjaro
-    version:             18.0-beta-5
-    shortVersion:        18.0-beta-5
-    versionedName:       Manjaro Linux 18.0-beta-5 "Illyria"
-    shortVersionedName:  Manjaro 18.0-beta-5
+    version:             18.0-beta-6
+    shortVersion:        18.0-beta-6
+    versionedName:       Manjaro Linux 18.0-beta-6 "Illyria"
+    shortVersionedName:  Manjaro 18.0-beta-6
     bootloaderEntryName: Manjaro
 
 images: