Skip to content

Commit 6f15281

Browse files
committed
chore: resolve merge conflict with upstream
Take version 0.17.13 from upstream while keeping bitsocial-cli branding
2 parents 0949337 + 6f7614e commit 6f15281

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ EXAMPLES
193193
$ plebbit daemon --plebbitOptions.kuboRpcClientsOptions[0] https://remoteipfsnode.com
194194
```
195195

196-
_See code: [src/cli/commands/daemon.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.12/src/cli/commands/daemon.ts)_
196+
_See code: [src/cli/commands/daemon.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.13/src/cli/commands/daemon.ts)_
197197

198198
## `plebbit help [COMMAND]`
199199

@@ -239,7 +239,7 @@ EXAMPLES
239239
$ plebbit subplebbit create --title 'Hello Plebs' --description 'Welcome'
240240
```
241241

242-
_See code: [src/cli/commands/subplebbit/create.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.12/src/cli/commands/subplebbit/create.ts)_
242+
_See code: [src/cli/commands/subplebbit/create.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.13/src/cli/commands/subplebbit/create.ts)_
243243

244244
## `plebbit subplebbit edit ADDRESS`
245245

@@ -292,7 +292,7 @@ EXAMPLES
292292
subplebbit edit plebbit.eth --settings.fetchThumbnailUrls=false
293293
```
294294

295-
_See code: [src/cli/commands/subplebbit/edit.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.12/src/cli/commands/subplebbit/edit.ts)_
295+
_See code: [src/cli/commands/subplebbit/edit.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.13/src/cli/commands/subplebbit/edit.ts)_
296296

297297
## `plebbit subplebbit get ADDRESS`
298298

@@ -317,7 +317,7 @@ EXAMPLES
317317
$ plebbit subplebbit get 12D3KooWG3XbzoVyAE6Y9vHZKF64Yuuu4TjdgQKedk14iYmTEPWu
318318
```
319319

320-
_See code: [src/cli/commands/subplebbit/get.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.12/src/cli/commands/subplebbit/get.ts)_
320+
_See code: [src/cli/commands/subplebbit/get.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.13/src/cli/commands/subplebbit/get.ts)_
321321

322322
## `plebbit subplebbit list`
323323

@@ -340,7 +340,7 @@ EXAMPLES
340340
$ plebbit subplebbit list
341341
```
342342

343-
_See code: [src/cli/commands/subplebbit/list.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.12/src/cli/commands/subplebbit/list.ts)_
343+
_See code: [src/cli/commands/subplebbit/list.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.13/src/cli/commands/subplebbit/list.ts)_
344344

345345
## `plebbit subplebbit start ADDRESSES`
346346

@@ -365,7 +365,7 @@ EXAMPLES
365365
$ plebbit subplebbit start 12D3KooWG3XbzoVyAE6Y9vHZKF64Yuuu4TjdgQKedk14iYmTEPWu
366366
```
367367

368-
_See code: [src/cli/commands/subplebbit/start.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.12/src/cli/commands/subplebbit/start.ts)_
368+
_See code: [src/cli/commands/subplebbit/start.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.13/src/cli/commands/subplebbit/start.ts)_
369369

370370
## `plebbit subplebbit stop ADDRESSES`
371371

@@ -390,7 +390,7 @@ EXAMPLES
390390
$ plebbit subplebbit stop Qmb99crTbSUfKXamXwZBe829Vf6w5w5TktPkb6WstC9RFW
391391
```
392392

393-
_See code: [src/cli/commands/subplebbit/stop.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.12/src/cli/commands/subplebbit/stop.ts)_
393+
_See code: [src/cli/commands/subplebbit/stop.ts](https://github.com/plebbit/plebbit-cli/blob/v0.17.13/src/cli/commands/subplebbit/stop.ts)_
394394
<!-- commandsstop -->
395395

396396
# Contribution

docs/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11

22

3+
## [0.17.13](https://github.com/plebbit/plebbit-cli/compare/v0.17.12...v0.17.13) (2026-01-04)
4+
35
## [0.17.12](https://github.com/plebbit/plebbit-cli/compare/v0.17.11...v0.17.12) (2026-01-03)
46

57
## [0.17.11](https://github.com/plebbit/plebbit-cli/compare/v0.17.10...v0.17.11) (2025-12-31)

oclif.manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,5 +612,5 @@
612612
]
613613
}
614614
},
615-
"version": "0.17.12"
615+
"version": "0.17.13"
616616
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bitsocial-cli",
3-
"version": "0.17.12",
3+
"version": "0.17.13",
44
"description": "Command line interface to BitSocial API",
55
"types": "./dist/index.d.ts",
66
"homepage": "https://github.com/bitsocialhq/bitsocial-cli",

0 commit comments

Comments
 (0)