Merge pull request #5506 from manassolanki/bs4

remove bs3 js from the frappe-web.min.js and include that in base.html
This commit is contained in:
Prateeksha Singh 2018-05-03 11:16:10 +05:30 committed by GitHub
commit 278a6fed78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View file

@ -10,7 +10,6 @@
"js/frappe-web.min.js": [
"public/js/frappe/class.js",
"public/js/frappe/polyfill.js",
"public/js/lib/bootstrap.min.js",
"public/js/lib/md5.min.js",
"public/js/frappe/provide.js",
"public/js/frappe/format.js",

View file

@ -82,6 +82,8 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.4/socket.io.slim.js"></script>
<script type="text/javascript"
src="/assets/js/frappe-web.min.js"></script>
<script type="text/javascript"
src="/assets/frappe/js/lib/bootstrap.min.js"></script>
{% endblock %}
{%- if js_globals is defined %}
<script>