mirror of
https://github.com/portainer/portainer.git
synced 2025-08-02 20:35:25 +02:00
Merge branch 'dev'
This commit is contained in:
commit
b77fb1ad03
11 changed files with 126 additions and 96 deletions
|
@ -29,12 +29,13 @@
|
|||
|
||||
<div class="container">
|
||||
|
||||
<div ng-include="template" ng-controller="MastheadController" ></div>
|
||||
<div id="view" ng-view>
|
||||
<div ng-include="template" ng-controller="MastheadController" ></div>
|
||||
<div id="view" ng-view>
|
||||
|
||||
</div>
|
||||
<div class="footer">
|
||||
<p>Created by:<a href="http://crosbymichael.com">Michael Crosby</a></p>
|
||||
<div class="container-bottom"></div>
|
||||
<div class="footer center well">
|
||||
<p>Created by: <a href="http://crosbymichael.com">crosbymichael</a></p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue