mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-03-31 14:41:55 -07:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-systemd
Conflicts: packages/sysutils/systemd/scripts/openelec-debugconfig packages/sysutils/timezone-data/package.mk packages/sysutils/timezone-data/scripts/tzdata-setup packages/sysutils/udisks/scripts/udisks-mount-disks packages/tools/installer/package.mk packages/x11/other/ratpoison/package.mk
This commit is contained in: