Merge staging-next into staging

2020-12-12 18:15:40 +00:00
parent 9254ca7f5e 553a9c6605
commit 1ab054fa5d
8 changed files with 11 additions and 11 deletions
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
    homepage="http://www.tinc-vpn.org/";
    license = licenses.gpl2Plus;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ fpletz lassulus ];
+    maintainers = with maintainers; [ fpletz lassulus mic92 ];
  };
 }