Merge develop into master in preparation for second release

ericcornelissen / NervousFish

An app for your :iphone: to exchange public-keys in a secure manner.

GNU Lesser General Public License v3.0

2 stars 4 forks source link

Closed ericcornelissen closed 7 years ago

ericcornelissen commented 7 years ago

Relevant Issues: -
Related Pull Requests: #58 (previous merge into master), #99 & #100 (preferably merged before this PR)
- *

This is the Pull Request for the second release of the application after sprint 2 (5 may 2017 to 12 may 2017).