summaryrefslogtreecommitdiff
path: root/ui/index.html
diff options
context:
space:
mode:
authorGrant Limberg <glimberg@gmail.com>2015-05-06 20:24:01 -0700
committerGrant Limberg <glimberg@gmail.com>2015-05-06 20:24:01 -0700
commit8130b2a0de08409e8c22dc388101b6b3877469dc (patch)
treeb421fdbfc21e468ec2a87fb218e6ab58f43281b0 /ui/index.html
parent20b76d266d0a0b425259fa57027e97121fd06c81 (diff)
parente58047eaa020e2810dd20ce6cc2eac32de071481 (diff)
downloadinfinitytier-8130b2a0de08409e8c22dc388101b6b3877469dc.tar.gz
infinitytier-8130b2a0de08409e8c22dc388101b6b3877469dc.zip
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'ui/index.html')
-rw-r--r--ui/index.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/index.html b/ui/index.html
index 83a4fb0e..eee4414a 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -4,14 +4,17 @@
<title>ZeroTier One</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta name="viewport" content="width=device-width, initial-scale=1">
+ <!--
<link rel="stylesheet" href="bootstrap.min.css">
<link rel="stylesheet" href="bootstrap-theme.min.css">
+ -->
<link rel="stylesheet" href="zerotier.css">
<script src="simpleajax.min.js"></script>
<script src="react.min.js"></script>
- <script src="JSXTransformer.js"></script>
+ <script src="JSXTransformer.min.js"></script>
+ <script type="text/jsx" src="ZeroTierNetwork.jsx"></script>
<script type="text/jsx" src="ZeroTierNode.jsx"></script>
<script type="text/jsx" src="main.jsx"></script>