Merge branch 'master' into develop

This commit is contained in:
Janek Bevendorff 2019-06-12 01:10:25 +02:00
commit 38524507d5
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
14 changed files with 1168 additions and 1248 deletions

View file

@ -144,10 +144,7 @@ DESTDIR=X
Packaging
=========
You can create a package to redistribute KeePassXC (zip, deb, rpm, dmg, etc..)
```
make package
```
You can create a package to redistribute KeePassXC (zip, deb, rpm, dmg, etc..). Refer to [keepassxc-packaging](https://github.com/keepassxreboot/keepassxc-packaging)
Testing