Skip to content

Commit 85c8f00

Browse files
committed
documentation: Bump version
1 parent e7b7ae8 commit 85c8f00

File tree

1 file changed

+26
-0
lines changed

1 file changed

+26
-0
lines changed

docs/changelog.md

+26
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
#### 1.5.0-beta.12
2+
3+
* Add `merge` command **1**
4+
* Fixes and improvements
5+
6+
**1**:
7+
8+
This command also parses path resources that appear in the configuration file and replaces them with embedded
9+
configuration, such as TLS certificates or SSH private keys.
10+
11+
```
12+
Merge configuration
13+
14+
Usage:
15+
sing-box merge [output] [flags]
16+
17+
Flags:
18+
-h, --help help for merge
19+
20+
Global Flags:
21+
-c, --config stringArray set configuration file path
22+
-C, --config-directory stringArray set configuration directory path
23+
-D, --directory string set working directory
24+
--disable-color disable color output
25+
```
26+
127
#### 1.5.0-beta.11
228

329
* Add DNS01 challenge support for ACME TLS certificate issuer **1**

0 commit comments

Comments
 (0)