Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 

Conflicts:
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
This commit is contained in:
Michael Hackstein 2014-04-23 16:05:51 +02:00
parent 1edd9f8699 2e7649dcbc
commit 093a86f4c1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/apps/system/aardvark/frontend/js/views/dashboardView.js
View File

@ -571,7 +571,7 @@
}
this.getStatistics();
this.prepareDygraphs();
if (self.isUpdating) {
if (this.isUpdating) {
this.prepareD3Charts();
this.prepareResidentSize();
this.updateTendencies();