summaryrefslogtreecommitdiff
path: root/share/frontend/imconcat
diff options
context:
space:
mode:
authorroot <root@dino.fm>2018-06-01 07:43:15 -0400
committerroot <root@dino.fm>2018-06-01 07:43:15 -0400
commit91948ccf90e5646ba630fafd631e95840bec9cf7 (patch)
treed951692dc15a45e35bdbf80489d8020222a153c4 /share/frontend/imconcat
parent89bf3f22da292969d48ed9cd7481afb023e8ba45 (diff)
parentabff780ddb60a5218c3a463a7e257024e02476a2 (diff)
Merge branch 'master' of ghghgh.us:photoblaster/photoblaster
Diffstat (limited to 'share/frontend/imconcat')
-rw-r--r--share/frontend/imconcat/index.html9
1 files changed, 6 insertions, 3 deletions
diff --git a/share/frontend/imconcat/index.html b/share/frontend/imconcat/index.html
index 78f43ea..909d2e0 100644
--- a/share/frontend/imconcat/index.html
+++ b/share/frontend/imconcat/index.html
@@ -3,9 +3,12 @@
<head>
<meta charset="utf-8" />
<title>Photoblaster Concatenate</title>
- <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
- <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+<!-- <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">-->
+ <link rel="stylesheet" href="css/bootstrap.css">
+<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>-->
+<script src="/js/jquery-1.11.0.min.js"></script>
+<script src="/js/bootstrap.min.js"></script>
+<!-- <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script> -->
<style type="text/css">
body{
line-height: 2em;