From 6de768dd6a09b8d1a5ffe582e0a6529b60a04073 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Mon, 21 Dec 2015 11:07:15 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

---
 interface/web/themes/default/templates/main_login.tpl.htm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/themes/default/templates/main_login.tpl.htm b/interface/web/themes/default/templates/main_login.tpl.htm
index 19b8373..afcf4cf 100644
--- a/interface/web/themes/default/templates/main_login.tpl.htm
+++ b/interface/web/themes/default/templates/main_login.tpl.htm
@@ -38,7 +38,7 @@
 		</div>
 	</div>
 </div>
-  <script type="text/javascript" src="js/jquery.min.js"></script>
+  <script type="text/javascript" src="../js/jquery.min.js"></script>
   <script src='../themes/<tmpl_var name='current_theme'>/assets/javascripts/bootstrap.min.js'></script>
   <script src='../themes/<tmpl_var name='current_theme'>/assets/javascripts/bootstrap-datetimepicker.min.js'></script>
   <script src='../themes/<tmpl_var name='current_theme'>/assets/javascripts/ispconfig.min.js'></script>

--
Gitblit v1.9.1