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

This commit is contained in:
yflory
2018-03-09 10:05:39 +01:00

View File

@@ -977,7 +977,8 @@ define(function () {
out.tos_logs = "Metadata provided by your browser to the server may be logged for the purpose of maintaining the service.";
out.tos_3rdparties = "We do not provide individualized data to third parties unless required to by law.";
// 404 page out.four04_pageNotFound = "We couldn't find the page you were looking for.";
// 404 page
out.four04_pageNotFound = "We couldn't find the page you were looking for.";
// BottomBar.html