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

Merge branch 'dev'

This commit is contained in:
Michael Crosby 2013-06-14 16:48:10 -09:00
commit e5dab43f46
11 changed files with 86 additions and 47 deletions

View file

@ -28,16 +28,12 @@
<body>
<div class="container">
<div ng-include="template" ng-controller="MastheadController"></div>
<div ng-include="template" ng-controller="MastheadController" ></div>
<div id="view" ng-view>
</div>
<div class="container-bottom"></div>
<div class="footer center well">
<p>Created by: <a href="http://crosbymichael.com">crosbymichael</a></p>
</div>
<div id="view" ng-view></div>
<div class="container-bottom"></div>
<div ng-include="template" ng-controller="StatusBarController"></div>
</div>
<script src="../assets/js/jquery.js"></script>