Merge branch 'version-13-hotfix' into version-13

frappe · Jul 13, 2023 · d3ce66e · d3ce66e
2 parents 40669fb + 0a16340
commit d3ce66e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/publish-assets-releases.yml b/.github/workflows/publish-assets-releases.yml
@@ -16,9 +16,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           path: 'frappe'
+
       - uses: actions/setup-node@v1
         with:
-          python-version: '12.x'
+          node-version: '12'
+
       - uses: actions/setup-python@v2
         with:
           python-version: '3.7'

diff --git a/frappe/email/__init__.py b/frappe/email/__init__.py
@@ -35,7 +35,7 @@ def get_contact_list(txt, page_length=20):
 		{"txt": "%" + txt + "%", "page_length": page_length},
 		as_dict=True,
 	)
-	out = filter(None, out)
+	out = list(filter(None, out))
 
 	update_contact_cache(out)