1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-02-10 19:41:43 +02:00

Merge branch 'release-1.1' into dev

This commit is contained in:
Laurent Cozic 2020-09-21 11:55:47 +01:00
commit cc1e941dd9
2 changed files with 2 additions and 2 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "Joplin", "name": "Joplin",
"version": "1.1.3", "version": "1.1.4",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "Joplin", "name": "Joplin",
"version": "1.1.3", "version": "1.1.4",
"description": "Joplin for Desktop", "description": "Joplin for Desktop",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {