web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' into framework

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-10-18 11:42:31 +03:00
parent 15337603bb d941b1098a
commit a149152f11
10 changed files with 209 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/sframe-common.js
View File

@@ -75,6 +75,7 @@ define([
funcs.initFilePicker = callWithCommon(UI.initFilePicker);
funcs.openFilePicker = callWithCommon(UI.openFilePicker);
funcs.openTemplatePicker = callWithCommon(UI.openTemplatePicker);
funcs.displayMediatagImage = callWithCommon(UI.displayMediatagImage);
funcs.displayAvatar = callWithCommon(UI.displayAvatar);
funcs.createButton = callWithCommon(UI.createButton);
funcs.createUsageBar = callWithCommon(UI.createUsageBar);