Merge remote-tracking branch 'origin/master' into staging

2014-07-14 17:04:55 +02:00
parent 0b82b95322 b57bc220cc
commit ff97b7dbe6
1429 changed files with 4283 additions and 353 deletions
@@ -824,5 +824,7 @@ in

    systemd.services."user@".restartIfChanged = false;

+    systemd.services.systemd-remount-fs.restartIfChanged = false;
+
  };
 }