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

This commit is contained in:
yflory
2017-02-27 17:23:40 +01:00
3 changed files with 33 additions and 2 deletions

View File

@@ -255,6 +255,7 @@ define(function () {
out.settings_resetTips = "Tips in CryptDrive";
out.settings_resetTipsButton = "Reset the available tips in CryptDrive";
out.settings_resetTipsDone = "All the tips are now visible again.";
out.settings_userFeedback = "disable user feedback";
// index.html