[taler-anastasis] 03/05: merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a commit to branch master
in repository anastasis.

commit 11e30e3ed583afe06730a72bd8afac1d48eedcb1
Merge: 50a8a0c 23d6287
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Fri Jun 5 18:38:40 2020 +0000

    merge

 doc/thesis/acknowledgments.tex               |   5 ++++-
 doc/thesis/bibliothek.bib                    |  10 ++++++++--
 doc/thesis/conclusion.tex                    |   9 +++------
 doc/thesis/images/project_plan_anastasis.pdf | Bin 415918 -> 0 bytes
 doc/thesis/images/project_plan_anastasis.png | Bin 0 -> 78409 bytes
 doc/thesis/related_work.tex                  |  10 +++++-----
 doc/thesis/thesis.tex                        |   2 +-
 7 files changed, 21 insertions(+), 15 deletions(-)

diff --cc doc/thesis/bibliothek.bib
index 3686e69,4e79252..3b6bd7c
--- a/doc/thesis/bibliothek.bib
+++ b/doc/thesis/bibliothek.bib
@@@ -308,18 -308,15 +308,24 @@@
    author={Pohlmann, Norbert and Frintrop, Jan-Hendrik and Widdermann, Rick 
and Ziegler, Tim},
    year={2017}
  }
 +@book{garfinkel1995,
 +  title={PGP: pretty good privacy},
 +  author={Garfinkel, Simson},
 +  year={1995},
 +  publisher={" O'Reilly Media, Inc."}
 +}
 +@inproceedings{LLLW*2017,
 +  title={An efficient method to enhance Bitcoin wallet security},
 +  author={Liu, Yi and Li, Ruilin and Liu, Xingtong and Wang, Jian and Zhang, 
Lei and Tang, Chaojing and Kang, Hongyan},
 +  booktitle={2017 11th IEEE International Conference on Anti-counterfeiting, 
Security, and Identification (ASID)},
 +  pages={26--29},
 +  year={2017},
 +  organization={IEEE}
 +}
- 
+ @online{emailauthowasp,
+       title        = {Forgot Password Cheat Sheet},
+       organization = {OWASP Foundation},
+       year         = 2020,    
+       urldate      = {2020-06-05},
+       url          = 
{https://cheatsheetseries.owasp.org/cheatsheets/Forgot_Password_Cheat_Sheet.html},
+ }
 -
 -
 -
 -
 -

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.