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

This commit is contained in:
Pierre Bondoerffer
2017-02-21 18:00:27 +01:00
7 changed files with 34 additions and 12 deletions

View File

@@ -234,7 +234,7 @@ define(function () {
"<li>You can import pads which were recently viewed in your browser so you have them in your account.</li>",
"<li>If you are using a shared computer, you need to log out when you are done, closing the tab is not enough.</li>",
"</ul>"
];
].join('');
// Settings
out.settings_title = "Settings";