Merge branch 'develop' into webpack

2018-11-04 17:54:55 +02:00
parent 7661b55920 e94d6ad6b2
commit ac090129aa
79 changed files with 818 additions and 255 deletions
@@ -12,6 +12,7 @@ angular.module('portainer.docker').component('containersDatatable', {
    reverseOrder: '<',
    showOwnershipColumn: '<',
    showHostColumn: '<',
-    showAddAction: '<'
+    showAddAction: '<',
+    offlineMode: '<'
  }
 });