1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00

Merge branch 'master' into stats

Conflicts:
	app/components/containers/containers.html
	app/components/images/images.html
This commit is contained in:
Kevan Ahlquist 2015-09-09 22:55:07 -05:00
commit c57a75f78f
3 changed files with 51 additions and 46 deletions

View file

@ -12,7 +12,7 @@
Container:
<input type="text" ng-model="container.newContainerName">
<button class="btn btn-success"
ng-click="renameContainer()">Edit
ng-click="renameContainer()">Save
</button>
<button class="btn btn-danger"
ng-click="container.edit = false;">&times;</button>