Merge branch 'staging-next' into staging

2019-06-05 11:12:34 +02:00
parent eb7c14fad1 576af17187
commit c0ccf42c69
234 changed files with 2709 additions and 1956 deletions
@@ -145,7 +145,7 @@
      #notbit = 111; # unused
      aerospike = 111;
      ngircd = 112;
-      btsync = 113;
+      #btsync = 113; # unused
      minecraft = 114;
      vault = 115;
      rippled = 116;
@@ -457,7 +457,7 @@
      #notbit = 111; # unused
      aerospike = 111;
      #ngircd = 112; # unused
-      btsync = 113;
+      #btsync = 113; # unused
      #minecraft = 114; # unused
      vault = 115;
      #ripped = 116; # unused