Skip to content

Commit 50b90f7

Browse files
committed
merge conflict
2 parents fb3a986 + 087a38d commit 50b90f7

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [1.1.27](https://github.com/CoCreate-app/CoCreate-api/compare/v1.1.26...v1.1.27) (2021-10-13)
2+
3+
4+
### Bug Fixes
5+
6+
* update dependencies ([b2dd924](https://github.com/CoCreate-app/CoCreate-api/commit/b2dd9240adb38d5245f70d195ec4e6b353a0a4da))
7+
18
## [1.1.26](https://github.com/CoCreate-app/CoCreate-api/compare/v1.1.25...v1.1.26) (2021-10-13)
29

310

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cocreate/api",
3-
"version": "1.1.26",
3+
"version": "1.1.27",
44
"description": "A simple api helper component in vanilla javascript used by JavaScript developers to create thirdparty api intergrations. CoCreate-api includes the client component and server side for api processing. Thirdparty apis can be accessible using HTML5 data-attributes and/or JavaScript API. ",
55
"keywords": [
66
"thirdparty-api-intergration",
@@ -63,9 +63,9 @@
6363
},
6464
"dependencies": {
6565
"@cocreate/action": "^1.2.27",
66-
"@cocreate/crud-client": "^1.4.0",
66+
"@cocreate/crud-client": "^1.4.1",
6767
"@cocreate/docs": "^1.2.30",
68-
"@cocreate/hosting": "^1.2.26",
68+
"@cocreate/hosting": "^1.2.27",
6969
"@cocreate/render": "^1.2.0",
7070
"@cocreate/socket-client": "^1.2.28"
7171
}

0 commit comments

Comments
 (0)