Merge branch 'master' into 'testing'

# Conflicts:
#   manjaro-arm-installer
This commit is contained in:
Strit 2019-04-18 07:19:21 +02:00
commit 2f6f7c411a

Diff Content Not Available