diff options
| author | VirtualTam <virtualtam+github@flibidi.net> | 2017-08-06 16:15:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-06 16:15:32 +0200 |
| commit | c7fcea1347e81072c5b77c1b3c2c6fb13f02c16f (patch) | |
| tree | 03e4d7bbdcfebdb704266caf4b5c0d87e90c02ce /doc/md/Versioning-and-Branches.md | |
| parent | 4758c18164f8168be0b3e422c4af86827c913390 (diff) | |
| parent | f320efd689f17737ccbdef46cdc430d9e637b807 (diff) | |
| download | Shaarli-c7fcea1347e81072c5b77c1b3c2c6fb13f02c16f.tar.gz Shaarli-c7fcea1347e81072c5b77c1b3c2c6fb13f02c16f.tar.zst Shaarli-c7fcea1347e81072c5b77c1b3c2c6fb13f02c16f.zip | |
Merge pull request #917 from virtualtam/documentation/fixes+improvements
Documentation fixes, improvements and additions
Diffstat (limited to 'doc/md/Versioning-and-Branches.md')
| -rw-r--r-- | doc/md/Versioning-and-Branches.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/md/Versioning-and-Branches.md b/doc/md/Versioning-and-Branches.md index e1d998e0..7097ca0a 100644 --- a/doc/md/Versioning-and-Branches.md +++ b/doc/md/Versioning-and-Branches.md | |||
| @@ -8,10 +8,10 @@ The `master` branch is the development branch. Any new change MUST go through th | |||
| 8 | 8 | ||
| 9 | Remarks: | 9 | Remarks: |
| 10 | 10 | ||
| 11 | * This branch shouldn't be used for production as it isn't necessary stable. | 11 | - This branch shouldn't be used for production as it isn't necessary stable. |
| 12 | * 3rd party aren't required to be compatible with the latest changes. | 12 | - 3rd party aren't required to be compatible with the latest changes. |
| 13 | * Official plugins, themes and libraries (contained within Shaarli organization repos) must be compatible with the master branch. | 13 | - Official plugins, themes and libraries (contained within Shaarli organization repos) must be compatible with the master branch. |
| 14 | * The version in this branch is always `dev`. | 14 | - The version in this branch is always `dev`. |
| 15 | 15 | ||
| 16 | ## `v0.x` branch | 16 | ## `v0.x` branch |
| 17 | 17 | ||
| @@ -37,7 +37,7 @@ For example, the current latest release is `v0.8.3`, the stable branch is an ali | |||
| 37 | 37 | ||
| 38 | Remarks: | 38 | Remarks: |
| 39 | 39 | ||
| 40 | * Shaarli release pace isn't fast, and the stable branch might be a few months behind the latest release. | 40 | - Shaarli release pace isn't fast, and the stable branch might be a few months behind the latest release. |
| 41 | 41 | ||
| 42 | ## Releases | 42 | ## Releases |
| 43 | 43 | ||