Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:35:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3518 from birarda/master

Browse source 
move jquery for easier updating in domain-server
This commit is contained in:
Brad Hefta-Gaub 2014-10-01 09:07:26 -07:00
commit b6fba04d4f
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/resources/web/assignment/index.shtml
View file

@ -6,7 +6,7 @@
</head>
<body>
<pre id='editor' style='font-size: 14px;'><!--#include file="placeholder.js"--></object></pre>
<script src='../js/jquery-2.0.3.min.js'></script>
<script src='../js/jquery.min.js'></script>
<script src='js/ace/ace.js' type='text/javascript'></script>
<script src='js/assignment.js' type='text/javascript'></script>
<div class='big-button' id='deploy-button'>

2
domain-server/resources/web/footer.html
View file

@ -1,4 +1,4 @@
</div>
<script src='/js/jquery-2.1.1.min.js'></script>
<script src='/js/jquery.min.js'></script>
<script src='/js/bootstrap.min.js'></script>
<script src='/js/domain-server.js'></script>

0
domain-server/resources/web/js/jquery-2.1.1.min.js → domain-server/resources/web/js/jquery.min.js vendored
View file