Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-03-16 14:47:03 +01:00
parent 7f2f1f7191 f98c825dc3
commit 5ed6223313
7 changed files with 192 additions and 22 deletions
--- a/www/common/fileObject.js
+++ b/www/common/fileObject.js
@@ -376,7 +376,7 @@ define([
                var paths = findFile(l);
                ret.push({
                    paths: findFile(l),
-                    data: getFileData(l)
+                    data: exp.getFileData(l)
                });
            });
            return ret;