Merge branch 'release-1.2'

This commit is contained in:
antelle 2016-07-12 20:58:37 +03:00
commit 24e17c6b79
2 changed files with 2 additions and 2 deletions

View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "1.2.0",
"version": "1.2.1",
"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.2.0",
"version": "1.2.1",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "Gruntfile.js",
"homepage": "https://keeweb.info",