Merge branch 'soon' into staging

This commit is contained in:
ansuz
2018-06-12 12:00:51 +02:00
4 changed files with 12 additions and 9 deletions

View File

@@ -680,6 +680,7 @@ define(function () {
out.main_slidePad = 'Markdown Presentation';
out.main_pollPad = 'Poll or Schedule';
out.main_whiteboardPad = 'Whiteboard';
out.main_kanbanPad = 'Kanban';
out.main_localPads = 'Local Pads';
out.main_yourCryptDrive = 'Your CryptDrive';
out.main_footerText = "With CryptPad, you can make quick collaborative documents for taking notes and writing down ideas together.";