Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

Merge branch 'dev'

Browse source 
Conflicts:
	js/controllers.js
This commit is contained in:
Michael Crosby 2013-06-23 09:34:19 -09:00
commit 5dc53c3abe
25 changed files with 883 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

5
index.html
View file

@ -29,6 +29,7 @@
<div class="container">
<div ng-include="template" ng-controller="MastheadController"></div>
<div ng-include="template" ng-controller="MessageController"></div>
<div id="view" ng-view></div>
@ -50,6 +51,9 @@
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
<script src="/lib/ace-builds/src-noconflict/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="/lib/spin.js" type="text/javascript" charset="utf-8"></script>
<script src="lib/angular/angular.js"></script>
<script src="lib/angular/angular-resource.js"></script>
@ -57,6 +61,7 @@
<script src="js/services.js"></script>
<script src="js/filters.js"></script>
<script src="js/controllers.js"></script>
<script src="js/viewmodel.js"></script>
</body>
</html>