diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-08-07 16:12:31 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-08-07 16:12:31 +0200 |
| commit | 9a12f169c15b638fe78cf6e85a1993550a25e404 (patch) | |
| tree | ee3efd50738036f899e17f56620dccbe2e39739b /CHANGELOG.md | |
| parent | 3d52b300ea79bec21f090e2447c4808307078618 (diff) | |
| parent | 59549436ef0e97351c22fd20d135e1a0b3a5a966 (diff) | |
| download | PeerTube-9a12f169c15b638fe78cf6e85a1993550a25e404.tar.gz PeerTube-9a12f169c15b638fe78cf6e85a1993550a25e404.tar.zst PeerTube-9a12f169c15b638fe78cf6e85a1993550a25e404.zip | |
Merge branch 'release/beta-10' into develop
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a116439ad..7062518ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
| @@ -1,5 +1,14 @@ | |||
| 1 | # Changelog | 1 | # Changelog |
| 2 | 2 | ||
| 3 | ## v1.0.0-beta.10 | ||
| 4 | |||
| 5 | **See the v1.0.0-beta.10.pre.1 changelog, in particular how to upgrade** | ||
| 6 | |||
| 7 | ### Bug fixes (from beta.10.pre.3) | ||
| 8 | |||
| 9 | * Fix caption upload on Mac OS | ||
| 10 | |||
| 11 | |||
| 3 | ## v1.0.0-beta.10.pre.3 | 12 | ## v1.0.0-beta.10.pre.3 |
| 4 | 13 | ||
| 5 | **See the v1.0.0-beta.10.pre.1 changelog, in particular how to upgrade** | 14 | **See the v1.0.0-beta.10.pre.1 changelog, in particular how to upgrade** |