Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 13:55:21 +02:00
Code Issues Releases Activity

Merge branch 'master' into events

Browse source 
Conflicts:
	app/app.js
	index.html
This commit is contained in:
Kevan Ahlquist 2015-05-14 01:33:08 -05:00
commit ef3596ff32
25 changed files with 616 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
index.html
View file

@ -9,6 +9,7 @@
<link href="assets/css/bootstrap.min.css" rel="stylesheet">
<link href="assets/css/jquery.gritter.css" rel="stylesheet">
<link href="assets/css/vis.min.css" rel="stylesheet">
<link href="<%= pkg.name %>.css" rel="stylesheet">
@ -27,6 +28,8 @@
<script src="assets/js/jquery.gritter.min.js"></script>
<script src="assets/js/Chart.min.js"></script>
<script src="assets/js/legend.js"></script>
<script src="assets/js/vis.min.js"></script>
<script src="assets/js/angular-vis.js"></script>
<script src="assets/js/oboe-browser.min.js"></script>
<script src="<%= pkg.name %>.js"></script>