Merge branch 'master' into webcrypto

This commit is contained in:
El RIDO
2019-01-07 21:29:14 +01:00
13 changed files with 47 additions and 34 deletions

View File

@@ -162,5 +162,6 @@
"In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a> (in English).",
"+++ no paste text +++": "+++ no paste text +++",
"Could not get paste data: %s":
"Could not get paste data: %s"
"Could not get paste data: %s",
"QR code": "QR code"
}