From 3256a4a6035af8e09bb243837166d663d185ceae Mon Sep 17 00:00:00 2001
From: Jorropo <jorropo.pgm@gmail.com>
Date: Tue, 21 Aug 2018 09:22:25 +0200
Subject: Fix changelog

---
 CHANGELOG.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 301ab51f1..eec280dd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 
 ### Features
 
- * Add ability to import videos from a URL (YouTube, Dailymotion, Vimeo, raw file etc) or torrent file/magnet. 
+ * Add ability to import videos from a URL (YouTube, Dailymotion, Vimeo, raw file etc) or torrent file/magnet.
  Should be explicitly enabled by the administrator in the configuration file
  * Add german, spanish, taiwan (traditional chinese) and occitan languages
  * Add ability to delete our account
@@ -20,12 +20,12 @@
  * Tracker only accept known infohash (avoid people to use your tracker for files unrelated to PeerTube)
  * Add database pool configuration ([@rigelk](https://github.com/rigelk))
  * Add audit log ([@Nautigsam](https://github.com/Nautigsam))
- * Add ffmpeg auto thread ([@jorropo](https://github.com/jorropo))
+ * Add ffmpeg nice and auto thread ([@jorropo](https://github.com/jorropo))
  * Upgrade to bootstrap 4
  * DNT support
 
 ### Bug fixes
- 
+
  * Fix videos FPS federation
  * Cleanup request files on bad request
  * Handle truncated markdown links
@@ -58,7 +58,7 @@
  * Move subscription helper in the account line in video watch page
  * Fix responsive on videos search
  * Refresh orphan actors
- * Don't send a follow request if the follow was already accepted 
+ * Don't send a follow request if the follow was already accepted
 
 
 ## v1.0.0-beta.10.pre.2
@@ -85,7 +85,7 @@ $ sudo -u postgres psql peertube_prod -c 'CREATE EXTENSION IF NOT EXISTS pg_trgm
 ```
 
 You will need [PostgreSQL Contrib](https://www.postgresql.org/docs/9.6/static/contrib.html).
-  
+
 ### BREAKING CHANGES
 
  * Require `unaccent` and `pg_trgm` PostgreSQL extension for the PeerTube database
@@ -95,7 +95,7 @@ You will need [PostgreSQL Contrib](https://www.postgresql.org/docs/9.6/static/co
  * Update default cache size configurations
  * Update search API route: `/videos/search` becomes `/search/videos`
  * Needs Redis >= 2.8.18
- 
+
 ### Features
 
  * Add ability to change the language of the interface (currently available: english, french, basque, catalan, czech and esperanto)
@@ -148,7 +148,7 @@ You will need [PostgreSQL Contrib](https://www.postgresql.org/docs/9.6/static/co
 ### Docker
 
  * Add PEERTUBE_SMTP_DISABLE_STARTTLS config env
- 
+
 
 ## v1.0.0-beta.9
 
@@ -400,7 +400,7 @@ You will need [PostgreSQL Contrib](https://www.postgresql.org/docs/9.6/static/co
 
 ## v1.0.0-beta.1
 
-Nothing new here, but PeerTube is stable enough for being in beta now. 
+Nothing new here, but PeerTube is stable enough for being in beta now.
 
 
 ## v1.0.0-alpha.9
@@ -438,7 +438,7 @@ Nothing new here, but PeerTube is stable enough for being in beta now.
 
 ### Features
 
- * Add ability to set a short instance description 
+ * Add ability to set a short instance description
 
 
 ## v1.0.0-alpha.7
@@ -550,7 +550,7 @@ Nothing new here, but PeerTube is stable enough for being in beta now.
 
 ### Features
 
- * Add ability to link a specific comment 
+ * Add ability to link a specific comment
 
 ### Bug fixes
 
-- 
cgit v1.2.3