Merge remote-tracking branch 'parent/master' into v0.12

shaarli · Oct 13, 2020 · e6678e0 · e6678e0
2 parents 1998996 + 6415238
commit e6678e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,4 +1,4 @@
-   989	ArthurHoaro <arthur@hoa.ro>
+   991	ArthurHoaro <arthur@hoa.ro>
    402	VirtualTam <virtualtam@flibidi.net>
    294	nodiscc <nodiscc@gmail.com>
     56	Sébastien Sauvage <sebsauvage@sebsauvage.net>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,13 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [v0.12.0](https://github.com/shaarli/Shaarli/releases/tag/v0.12.0-beta) - UNRELEASED
-*[beta 2020-08-27 - beta-1 2020-09-30 - beta-2 2020-10-08]*
+## [v0.12.1]() - UNRELEASED
 
-**Save you `data/` folder before updating!**
+## [v0.12.0](https://github.com/shaarli/Shaarli/releases/tag/v0.12.0) - 2020-10-13
 
-This is a beta version containing major changes, including new URLs for Shaarli and datastore format update.
-Be aware that by using a beta version you might encounter bugs, and that 3rd party themes or plugins might not be compatible.
+**Save you `data/` folder before updating!**
 
 ### Added
 - Thumbnailer: add soundcloud.com to list of common media domains