diff options
| author | Jason Croft | 2016-05-12 12:32:10 -0400 |
|---|---|---|
| committer | Jason Croft | 2016-05-12 12:32:10 -0400 |
| commit | e65d43bd81dc9af9be0c6df599800bc3ccf15a5e (patch) | |
| tree | 99f23b8a7d3885ca440ae952e6034da56c9d83f5 /public/views/index.ejs | |
| parent | 30e602a7400f3b38918a55f1470610b8d4ee49d7 (diff) | |
| parent | 4aa4e3eacc36ae54c49ac94cf40594f33c4d9b1d (diff) | |
Merge remote-tracking branch 'origin/master' into gitlab_snippets
# Conflicts:
# bower.json
# public/views/body.ejs
Diffstat (limited to 'public/views/index.ejs')
| -rw-r--r-- | public/views/index.ejs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/public/views/index.ejs b/public/views/index.ejs index 85d955b7..69b525e9 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -17,7 +17,7 @@ <!-- Bootstrap core CSS --> <% if(useCDN) { %> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"> - <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"> + <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.6.2/css/font-awesome.min.css"> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css"> <% } else { %> <link rel="stylesheet" href="<%- url %>/vendor/bootstrap/dist/css/bootstrap.min.css"> @@ -174,7 +174,7 @@ </div> </div> </div> - <%- include modal %> + <%- include signin-modal %> <!-- Bootstrap core JavaScript ================================================== --> |