Merge branch 'develop' into feature-aggregation

2015-08-14 20:20:53 +03:00
parent 221d42c172 877cadecae
commit 53f20fe417
2 changed files with 8 additions and 8 deletions
--- a/zabbix/partials/config.html
+++ b/zabbix/partials/config.html
@@ -42,7 +42,7 @@
    </li>
    <li ng-if="current.jsonData.trends">
      <input type="text" class="tight-form-input input-small"
-             ng-model='current.basicAuthUser'
+             ng-model='current.jsonData.trendsFrom'
             placeholder="7d">
    </li>
  </ul>