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

Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2

Browse Source
This commit is contained in:
ansuz
2017-03-02 11:07:17 +01:00
parent 3619fdc77a 6b8d0c8bc7
commit c9040997d5
42 changed files with 167 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/translations/messages.js
View File

@@ -221,7 +221,7 @@ define(function () {
out.login_noSuchUser = 'Invalid username or password. Try again, or sign up';
out.login_invalUser = 'Username required';
out.login_invalPass = 'Password required';
out.login_unhandledError = 'An unexpected error occured :(';
out.login_unhandledError = 'An unexpected error occurred :(';
out.register_importRecent = "Import pad history (Recommended)";
out.register_acceptTerms = "I accept <a href='/terms.html'>the terms of service</a>";