Merge branch 'master' of https://git.cse.iitb.ac.in/ARFA/ARFA

9e9fe6ec · NARRA SURAJ · cd41d35f · cb3dfd3e · 9e9fe6ec · 9e9fe6ec
Commit 9e9fe6ec authored Nov 26, 2018 by NARRA SURAJ
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ARFA/ARFA_app/static/ARFA_app/favicon.ico ARFA/ARFA_app/static/ARFA_app/favicon.ico +0 -0

ARFA/ARFA_app/templates/base.html ARFA/ARFA_app/templates/base.html +1 -1

No files found.
--- a/ARFA/ARFA_app/static/ARFA_app/favicon.ico
+++ b/ARFA/ARFA_app/static/ARFA_app/favicon.ico
--- a/ARFA/ARFA_app/templates/base.html
+++ b/ARFA/ARFA_app/templates/base.html
@@ -4,7 +4,7 @@
    <head>
        <!-- Latest compiled and minified CSS -->
        {% load static %}
-
+        <link rel="icon" href="{% static 'ARFA_app/favicon.ico' %}">
        <link rel="stylesheet" href="{% static 'ARFA_app/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css' %}" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
        <!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> -->
        <script src="{% static 'ARFA_app/lib/jquery/jquery-3.3.1.min.js' %}"></script>