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

This commit is contained in:
ansuz committed 2017-03-16 14:47:03 +01:00
commit 5ed6223313
7 files changed
+192 -22

No files matched your search

+1 -1
View File
@@ -376,7 +376,7 @@ define([
var paths = findFile(l);
ret.push({
paths: findFile(l),
data: getFileData(l)
data: exp.getFileData(l)
});
});
return ret;