Merge branch 'master' into nonet

Conflicts:
	docs/README.md
This commit is contained in:
Philipp Crocoll
2017-12-02 14:25:37 +01:00
113 changed files with 4135 additions and 1411 deletions

View File

@@ -10,7 +10,7 @@ Beta-releases can be obtained by opting in to the [Beta testing channel](https:/
# How can I contribute?
* Help to translate Keepass2Android into your language or improve translations at [our Crowdin page](http://crowdin.net/project/keepass2android)
* Add features by [creating a plugin](How-to-create-a-plug-in_) or creating a pull request. You might want to contact me before you start working so I can coordinate efforts.
* Add features by [creating a plugin](How-to-create-a-plug-in_.md) or creating a pull request. You might want to contact me before you start working so I can coordinate efforts.
* [Make a donation](http://philipp.crocoll.net/donate.php)
# How do I learn more?