From ed552ba47c02779c270ffd62841d6d1048dade70 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sun, 22 Nov 2015 14:37:16 -0500 Subject: [PATCH] Merge branch 'develop' --- src/main/java/com/gitblit/wicket/pages/BasePage.html | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/BasePage.html b/src/main/java/com/gitblit/wicket/pages/BasePage.html index 89a28b8..b998428 100644 --- a/src/main/java/com/gitblit/wicket/pages/BasePage.html +++ b/src/main/java/com/gitblit/wicket/pages/BasePage.html @@ -15,6 +15,7 @@ <link rel="stylesheet" href="bootstrap/css/bootstrap.css"/> <link rel="stylesheet" href="bootstrap/css/iconic.css"/> <link rel="stylesheet" href="fontawesome/css/font-awesome.min.css"/> + <link rel="stylesheet" href="octicons/octicons.css"/> <link rel="stylesheet" type="text/css" href="gitblit.css"/> </wicket:head> @@ -50,5 +51,6 @@ <!-- Include scripts at end for faster page loading --> <script type="text/javascript" src="bootstrap/js/jquery.js"></script> <script type="text/javascript" src="bootstrap/js/bootstrap.js"></script> + <wicket:container wicket:id="bottomScripts"></wicket:container> </body> </html> \ No newline at end of file -- Gitblit v1.9.1