Merge master into staging-next

2021-05-17 06:22:23 +00:00
parent d8e62d8e41 e906410c9a
commit 3ff6965554
154 changed files with 1062 additions and 1089 deletions
@@ -33,7 +33,7 @@ in mkDerivation {
    description = "Smart manager for information collecting";
    homepage = "https://webhamster.ru/site/page/index/articles/projectcode/138";
    license = licenses.gpl3;
-    maintainers = [ maintainers.gnidorah ];
+    maintainers = [ ];
    platforms = platforms.linux;
  };
 }