Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-04-22 18:14:27 +00:00
committed by GitHub
37 changed files with 229 additions and 405 deletions
+4
View File
@@ -7743,6 +7743,8 @@ in {
telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { };
telfhash = callPackage ../development/python-modules/telfhash { };
tempita = callPackage ../development/python-modules/tempita { };
tempora = callPackage ../development/python-modules/tempora { };
@@ -8754,5 +8756,7 @@ in {
zulip = callPackage ../development/python-modules/zulip { };
zwave-js-server-python = callPackage ../development/python-modules/zwave-js-server-python { };
zxcvbn = callPackage ../development/python-modules/zxcvbn { };
}