merge with origin and add localize

2017-10-13 17:07:17 +06:30
parent 1ba68cd152
commit bfe3727e7d
41 changed files with 91 additions and 84 deletions
--- a/app/views/settings/zones/index.html.erb
+++ b/app/views/settings/zones/index.html.erb
@@ -22,7 +22,7 @@
            <th>Name</th>
            <th>Is active</th>
            <th>Created by</th>
-            <th></th>
+            <th>Action</th>
          </tr>
        </thead>