Skip to content
This repository has been archived by the owner on Jun 15, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/3.5.15'
Browse files Browse the repository at this point in the history
  • Loading branch information
radko93 committed Dec 29, 2020
2 parents a506a56 + a5a26aa commit 612cb91
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 11 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "StandardNotes",
"version": "3.5.14",
"user-version": "3.5.14",
"version": "3.5.15",
"user-version": "3.5.15",
"private": true,
"license": "AGPL-3.0-or-later",
"scripts": {
Expand All @@ -26,7 +26,7 @@
"@react-navigation/native": "^5.8.10",
"@react-navigation/stack": "^5.12.8",
"@standardnotes/sncrypto-common": "1.2.9",
"@standardnotes/snjs": "2.0.27",
"@standardnotes/snjs": "2.0.30",
"js-base64": "^3.5.2",
"moment": "^2.29.1",
"react": "16.13.1",
Expand Down Expand Up @@ -55,7 +55,7 @@
"react-native-version-info": "^1.1.0",
"react-native-webview": "^10.10.2",
"react-navigation-header-buttons": "^6.0.0",
"sn-textview": "standardnotes/sn-textview#f140ea8de28ac3a75eb5a3a6a521b637ef78d207",
"sn-textview": "standardnotes/sn-textview#3b56f5c2c87c24370f00ee5a0cee0da9a9fc66c3",
"standard-notes-rn": "standardnotes/standard-notes-rn#996b016",
"styled-components": "^5.2.1"
},
Expand All @@ -67,7 +67,7 @@
"@types/faker": "^5.1.3",
"@types/jest": "^26.0.14",
"@types/js-base64": "^3.0.0",
"@types/react-native": "0.63.40",
"@types/react-native": "0.63.42",
"@types/react-native-vector-icons": "^6.4.6",
"@types/styled-components": "^5.1.5",
"@typescript-eslint/eslint-plugin": "^3.10.1",
Expand Down
19 changes: 13 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1364,10 +1364,10 @@
resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.2.9.tgz#5212a959e4ec563584e42480bfd39ef129c3cbdf"
integrity sha512-xJ5IUGOZztjSgNP/6XL+Ut5+q9UgSTv6xMtKkcQC5aJxCOkJy9u6RamPLdF00WQgwibxx2tu0e43bKUjTgzMig==

"@standardnotes/[email protected].27":
version "2.0.27"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.0.27.tgz#6356f17c3ff2288a35ddf4cb311872c0e73dc54c"
integrity sha512-VEhqsgnYHTBD49SMNAn276dbPP4KN1pQQhtJFh9dM9JK2LS0OsbYuatiNS0bzEXkxVCaSYLTsaRb3rk7tciQyg==
"@standardnotes/[email protected].30":
version "2.0.30"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.0.30.tgz#767be04c0a40850f759b58be7615fbfaa7af9a50"
integrity sha512-60vMyyKED7WUgQcQRzYfCA7LjiJbzpnheQkdfELKdNW3bb5LoihdDPnai8hmDSY5ul4IkcD7dtkdQPBIEvFXSw==
dependencies:
"@standardnotes/sncrypto-common" "^1.2.9"

Expand Down Expand Up @@ -1524,6 +1524,13 @@
dependencies:
"@types/react" "*"

"@types/[email protected]":
version "0.63.42"
resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.63.42.tgz#d0baf405edc646d15d5a7f8e67983b8701c1ea2a"
integrity sha512-zb7m2Uwfz6MQh/Nq1DDAmzTRO+EQWV7ZyRl9ZZ2QLd1480xjRjPDQqRkp4vuk3gyRlQtwi0v9I3tOh2IxHFujw==
dependencies:
"@types/react" "*"

"@types/react@*":
version "16.9.49"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.49.tgz#09db021cf8089aba0cdb12a49f8021a69cce4872"
Expand Down Expand Up @@ -7471,9 +7478,9 @@ slide@^1.1.5:
resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=

sn-textview@standardnotes/sn-textview#f140ea8de28ac3a75eb5a3a6a521b637ef78d207:
sn-textview@standardnotes/sn-textview#3b56f5c2c87c24370f00ee5a0cee0da9a9fc66c3:
version "1.0.0"
resolved "https://codeload.github.com/standardnotes/sn-textview/tar.gz/f140ea8de28ac3a75eb5a3a6a521b637ef78d207"
resolved "https://codeload.github.com/standardnotes/sn-textview/tar.gz/3b56f5c2c87c24370f00ee5a0cee0da9a9fc66c3"

snapdragon-node@^2.0.1:
version "2.1.1"
Expand Down

0 comments on commit 612cb91

Please sign in to comment.