Merge branch 'master' into develop

# Conflicts:
#	desktop/package-lock.json
#	package-lock.json
#	release-notes.md
This commit is contained in:
antelle 2021-03-02 20:10:18 +01:00
commit 97374f63f9
No known key found for this signature in database
GPG Key ID: 63C9777AAB7C563C
3 changed files with 3 additions and 10 deletions

View File

@ -1,8 +1 @@
blank_issues_enabled: false
contact_links:
- name: Discussions
url: https://github.com/keeweb/keeweb/discussions
about: A place to ask and answer questions or discuss different topics
- name: Twitter
url: https://twitter.com/kee_web
about: Ask a quick question there if you like Twitter more
blank_issues_enabled: true

View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "1.16.7",
"version": "1.16.8",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "main.js",
"homepage": "https://keeweb.info",

View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.16.7",
"version": "1.16.8",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "Gruntfile.js",
"private": true,