Merge branch 'master' into js-unit-testing

This commit is contained in:
El RIDO 2017-11-13 22:02:15 +01:00
commit c2133cfa7e
No known key found for this signature in database
GPG Key ID: 0F5C940A6BD81F92

View File

@ -9,8 +9,8 @@
*Current version: 1.1.1* *Current version: 1.1.1*
**PrivateBin** is a minimalist, open source online pastebin where the server has **PrivateBin** is a minimalist, open source online [pastebin](https://en.wikipedia.org/wiki/Pastebin)
zero knowledge of pasted data. where the server has zero knowledge of pasted data.
Data is encrypted and decrypted in the browser using 256bit AES in [Galois Counter mode](https://en.wikipedia.org/wiki/Galois/Counter_Mode). Data is encrypted and decrypted in the browser using 256bit AES in [Galois Counter mode](https://en.wikipedia.org/wiki/Galois/Counter_Mode).