diff --git a/CHANGELOG b/CHANGELOG
index c2d9be1a7685c91119632865dc6de24e0fb866a1..c56d58836179a84d0af30ad333764a55d800a136 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,9 +3,42 @@ Changelog
 
 .. towncrier
 
-0.10 (Unreleased)
+0.10 (2018-04-23)
 -----------------
 
+Features:
+
+- Can now import files in-place from the CLI importer (#155)
+
+
+Enhancements:
+
+- Avoid downloading audio files multiple times from remote libraries (#163)
+- Better file import performance and error handling (#144)
+- Import job and batch API and front-end have been improved with better
+  performance, pagination and additional filters (#171)
+- Increased max_length on TrackFile.source, this will help when importing files
+  with a really long path (#142)
+- Player is back in Queue tab (#150)
+
+
+Bugfixes:
+
+- Fail graciously when AP representation includes a null_value for mediaType
+- Fix sidebar tabs not showing under small resolution under Chrome (#173)
+- Fixed broken login due to badly configured Axios (#172)
+- Fixed broken playlist modal after login (#155)
+- Fixed queue reorder or track deletion restarting currently playing track
+  (#151)
+- Radio will now append new track if you delete the last track in queue (#145)
+- Reset all sensitive front-end data on logout (#124)
+- Typos/not showing text due to i18n work (#175)
+
+
+Documentation:
+
+- Better documentation for hardware requirements and memory usage (#165)
+
 
 In-place import
 ^^^^^^^^^^^^^^^
@@ -14,8 +47,9 @@ This release includes in-place imports for the CLI import. This means you can
 load gigabytes of music into funkwhale without worrying about about Funkwhale
 copying those music files in its internal storage and eating your disk space.
 
-This new feature is documented <here> and require additional configuration
-to ensure funkwhale and your webserver can serve those files properly.
+`This new feature is documented here <https://docs.funkwhale.audio/importing-music.html#in-place-import>`_
+and require additional configuration to ensure funkwhale and your webserver can
+serve those files properly.
 
 **Non-docker users:**
 
@@ -45,7 +79,9 @@ Assuming you have the following volume directive in your ``docker-compose.yml``
 (it's the default): ``/srv/funkwhale/data/music:/music:ro``, then add
 the following to your .env file::
 
+    # this is the path in the container
     MUSIC_DIRECTORY_PATH=/music
+    # this is the path on the host
     MUSIC_DIRECTORY_SERVE_PATH=/srv/funkwhale/data/music
 
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index f3a544e460a55bd0399a00d7ec62f70aed20f12c..596926919170b9efbf5914a51010f9da8f67751d 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.9.1'
+__version__ = '0.10'
 __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])
diff --git a/changes/changelog.d/124.bugfix b/changes/changelog.d/124.bugfix
deleted file mode 100644
index b1e104a438b776a035818bb0bf440dc6d7caa5f8..0000000000000000000000000000000000000000
--- a/changes/changelog.d/124.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Reset all sensitive front-end data on logout (#124)
diff --git a/changes/changelog.d/142.enhancement b/changes/changelog.d/142.enhancement
deleted file mode 100644
index 9784f540339d4afc8c69291f2cf301bfd3435763..0000000000000000000000000000000000000000
--- a/changes/changelog.d/142.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Increased max_length on TrackFile.source, this will help when importing files with a really long path (#142)
diff --git a/changes/changelog.d/144.enhancement b/changes/changelog.d/144.enhancement
deleted file mode 100644
index 2c238ed216ec7c3a2d58386821c32c693854e88f..0000000000000000000000000000000000000000
--- a/changes/changelog.d/144.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Better file import performance and error handling (#144)
diff --git a/changes/changelog.d/145.bugfix b/changes/changelog.d/145.bugfix
deleted file mode 100644
index 5c66e5f8bd84ad984020c2eb3d28ebe2f3671b97..0000000000000000000000000000000000000000
--- a/changes/changelog.d/145.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Radio will now append new track if you delete the last track in queue (#145)
diff --git a/changes/changelog.d/150.enhancement b/changes/changelog.d/150.enhancement
deleted file mode 100644
index 419b0a4b250f30c665e053a5d3e6c9cd31a7c486..0000000000000000000000000000000000000000
--- a/changes/changelog.d/150.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Player is back in Queue tab (#150)
diff --git a/changes/changelog.d/151.bugfix b/changes/changelog.d/151.bugfix
deleted file mode 100644
index 801da2a9c98640f13de4af87057b4381084d3feb..0000000000000000000000000000000000000000
--- a/changes/changelog.d/151.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed queue reorder or track deletion restarting currently playing track (#151)
diff --git a/changes/changelog.d/153.feature b/changes/changelog.d/153.feature
deleted file mode 100644
index 1a2e1b92e51def5b63115ed5adcdd3006d394c17..0000000000000000000000000000000000000000
--- a/changes/changelog.d/153.feature
+++ /dev/null
@@ -1 +0,0 @@
-Can now import files in-place from the CLI importe (#155)
diff --git a/changes/changelog.d/155.bugfix b/changes/changelog.d/155.bugfix
deleted file mode 100644
index 2252d56d7d2a0c5db5735cc8d00195746ab5b772..0000000000000000000000000000000000000000
--- a/changes/changelog.d/155.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed broken playlist modal after login (#155)
diff --git a/changes/changelog.d/163.enhancement b/changes/changelog.d/163.enhancement
deleted file mode 100644
index 89225eb9cb32f0e148ec5030f77b27f507859b4e..0000000000000000000000000000000000000000
--- a/changes/changelog.d/163.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Avoid downloading audio files multiple times from remote libraries (#163)
diff --git a/changes/changelog.d/165.doc b/changes/changelog.d/165.doc
deleted file mode 100644
index 4825af09bfd59db9e2ace6844962c738d01524f6..0000000000000000000000000000000000000000
--- a/changes/changelog.d/165.doc
+++ /dev/null
@@ -1 +0,0 @@
-Better documentation for hardware requirements and memory usage (#165)
diff --git a/changes/changelog.d/171.enhancement b/changes/changelog.d/171.enhancement
deleted file mode 100644
index 14e9f6d9bb4f35bd0c5a933670d9c2f9513fb024..0000000000000000000000000000000000000000
--- a/changes/changelog.d/171.enhancement
+++ /dev/null
@@ -1,2 +0,0 @@
-Import job and batch API and front-end have been improved with better performance,
-pagination and additional filters (#171)
diff --git a/changes/changelog.d/172.bugfix b/changes/changelog.d/172.bugfix
deleted file mode 100644
index 1ab68c76dc34959e05f319394650670456c8311e..0000000000000000000000000000000000000000
--- a/changes/changelog.d/172.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed broken login due to badly configured Axios (#172)
diff --git a/changes/changelog.d/173.bugfix b/changes/changelog.d/173.bugfix
deleted file mode 100644
index f22f85cf0daf8485a018f6bad3de8c4e3d7f073c..0000000000000000000000000000000000000000
--- a/changes/changelog.d/173.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix sidebar tabs not showing under small resolution under Chrome (#173)
diff --git a/changes/changelog.d/175.bugfix b/changes/changelog.d/175.bugfix
deleted file mode 100644
index f62a5273d92c3d098e3ab4cc835f74e399ebfeb3..0000000000000000000000000000000000000000
--- a/changes/changelog.d/175.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Typos/not showing text due to i18n work (#175)
diff --git a/changes/changelog.d/media-type.bugfix b/changes/changelog.d/media-type.bugfix
deleted file mode 100644
index cf6abf97de347b58722cb20223ee60736c6b7cd5..0000000000000000000000000000000000000000
--- a/changes/changelog.d/media-type.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fail graciously when AP representation includes a null_value for mediaType