Merge master into staging-next

2021-05-19 18:34:10 +00:00
parent c1f8a15dac 3806f9c991
commit 8a5e4be6b6
12 changed files with 88 additions and 35 deletions
@@ -170,6 +170,11 @@
       section of the NixOS manual</link> for more information.
     </para>
   </listitem>
+   <listitem>
+     <para>
+       <xref linkend="opt-services.nebula.networks" /> <link xlink:href="https://github.com/slackhq/nebula">Nebula VPN</link>
+     </para>
+   </listitem>
  </itemizedlist>

 </section>