Merge remote-tracking branch 'origin/pr/43'

* origin/pr/43:
  preset disable tinyproxy by default
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-11 05:27:52 +01:00
commit 90b4398863
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -30,6 +30,8 @@ disable plymouth-quit-wait.service
disable smartd.service
disable upower.service
disable colord.service
## conflicts with qubes-updates-proxy.service
disable tinyproxy.service
# Fedora only services
disable backuppc.service