commit c9dc902dee0089e407048916108a4dc9674eb2a6
author Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Thu Jul 07 09:40:21 2022 +0530
committer GitHub <noreply@github.com> Thu Jul 07 09:40:21 2022 +0530
tree c9d1667193c4d16c0ab4c0ef57f4f00f66f2f1f6
parent f0e8a518cdd645d0a91e5eff8ac1490390b6fb96
parent 7053bb9bb82418c3bb917712d6996bcab45ff18e

Merge branch 'develop' into update-library-usage

erpnext/templates/pages/projects.html

diff --git a/erpnext/templates/pages/projects.html b/erpnext/templates/pages/projects.html
index 76eaf75..6d366c5 100644
--- a/erpnext/templates/pages/projects.html
+++ b/erpnext/templates/pages/projects.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block head_include %}
-  <link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
+  <link rel="stylesheet" href="/assets/frappe/css/fonts/fontawesome/font-awesome.min.css">
 {% endblock %}
 
 {% block header %}

erpnext/templates/pages/search_help.py

diff --git a/erpnext/templates/pages/search_help.py b/erpnext/templates/pages/search_help.py
index a6877ce..d158167 100644
--- a/erpnext/templates/pages/search_help.py
+++ b/erpnext/templates/pages/search_help.py
@@ -1,9 +1,9 @@
 import frappe
 import requests
 from frappe import _
+from frappe.core.utils import html2text
 from frappe.utils import sanitize_html
 from frappe.utils.global_search import search
-from html2text import html2text
 from jinja2 import utils