Merge branch 'dev' of github.com:laurent22/joplin into dev

pull/5057/head
Laurent Cozic 2021-06-06 19:14:48 +02:00
commit 23cfbc2367
2 changed files with 12 additions and 12 deletions

View File

@ -25,11 +25,11 @@ In order to operate this service, the following user data is stored:
- Stripe user ID
- Stripe subscription ID
Financial information is processed by a Stripe. We do not store financial information.
Financial information is processed by Stripe. We do not store financial information.
## How do we use personal information?
We use the email to authentify the user and allow them to login to the service and synchronise data with it. We also use it to send important emails, such as email verification or to recover a lost password. Occasionally, we may send important notifications to our users.
We use the email to authenticate the user and allow them to login to the service and synchronise data with it. We also use it to send important emails, such as email verification or to recover a lost password. Occasionally, we may send important notifications to our users.
## What legal basis do we have for processing your personal data?

View File

@ -19,7 +19,7 @@ The use of this website is subject to the following terms of use:
- The content of the pages of this website is for your general information and use only. It is subject to change without notice.
- This website uses cookies to save login session. If you do allow cookies to be used, you will not be able to login to the website.
- This website uses cookies to save login session. If you do not allow cookies to be used, you will not be able to login to the website.
- Neither we nor any third parties provide any warranty or guarantee as to the accuracy, timeliness, performance, completeness or suitability of the information and materials found or offered on this website for any particular purpose. You acknowledge that such information and materials may contain inaccuracies or errors and we expressly exclude liability for any such inaccuracies or errors to the fullest extent permitted by law.