Skip to content

Commit

Permalink
Merge branch 'master' into work
Browse files Browse the repository at this point in the history
  • Loading branch information
zakuni committed Dec 19, 2013
2 parents 13353f6 + 65ef40f commit d541c6a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion views/result.slim
Expand Up @@ -2,7 +2,7 @@ doctype html
html
head
meta charset='UTF-8'
script src='https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js'
script src='https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js'
script src='assets/js/bootstrap.min.js'
script src='assets/js/main.js'
link rel="stylesheet" href="assets/css/bootstrap.min.css"
Expand Down

0 comments on commit d541c6a

Please sign in to comment.