Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2015-12-21 6de768dd6a09b8d1a5ffe582e0a6529b60a04073

Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

 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>