Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
dieechtenilente committed Aug 22, 2018
2 parents 91b02d1 + 7ca5814 commit 2c61ead
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,22 @@ Example of the string sent by the app:
The `LogTrace` is for future use: Logging every exception into a file.

Disclaimer for the sake of the EU-GDPR

```
By pressing the "send message" button in the "Send Feedback" form you agree that the data entered above, information about your device (manufacturer, model, operating system and its version), your current IP-Address and the opt-in date as well as information about the app (version number, log files, stored mixtures/recipes) will be sent securely. Data beyond the one provided by you optional (Name, E-Mail-Address, Message) is used to ensure a better problem solving process and are stored until revocation and are deleted after 10 years (except there are other valid lawfully retention periods).\nNo other personal data (photos, videos, etc.) are sent!\nThe name and the e-mail address are optional, but useful for inquiries/feedback.\nYou can always contact us via e-mail ([email protected]) about your saved data and request a copy, cancellation or rectification. In addition, you have the right to contact the data protection authority responsible for you (for example your national data protection officer).
By pressing the "send message" button in the "Send Feedback" form you agree that the data entered above,
information about your device (manufacturer, model, operating system and its version), your current
IP-Address and the opt-in date as well as information about the app (version number, log files, stored
mixtures/recipes) will be sent securely. Data beyond the one provided by you optional (Name,
E-Mail-Address, Message) is used to ensure a better problem solving process and are stored until
revocation and are deleted after 10 years (except there are other valid lawfully retention periods).
No other personal data (photos, videos, etc.) are sent!
The name and the e-mail address are optional, but useful for inquiries/feedback.
You can always contact us via e-mail ([email protected]) about your saved data and request a copy,
cancellation or rectification. In addition, you have the right to contact the data protection authority
responsible for you (for example your national data protection officer).
```

## Issues
Expand Down

0 comments on commit 2c61ead

Please sign in to comment.