Merge branch 'v0.11' into stable

[github/shaarli/Shaarli.git] / CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abf802ead6c89a2663f843860b124d4226e49135..e4991c4d7ce9c5d3d59229fd4793290ead11dd23 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -339,7 +339,7 @@ configuration to enable URL rewriting, see:
         - `/api/v1/info`: get general information on the Shaarli instance
         - `/api/v1/links`: get a list of shaared links
         - `/api/v1/history`: get a list of latest actions
-Theming:
+          Theming:
     - Introduce a new theme
     - Allow selecting themes/templates from the configuration page
     - New/Edit link form can be submitted using CTRL+Enter in the textarea
@@ -637,12 +637,12 @@ Please use our release archives, or follow the
 - Cleanup: introduce an `ApplicationUtils` class
 
 ### Removed
- - Cleanup: remove `json_encode()` function (built-in since PHP 5.2)
+- Cleanup: remove `json_encode()` function (built-in since PHP 5.2)
 
 ### Fixed
- - Auto-complete more than one tag
- - Bookmarklet: support titles containing quotes
- - URL encode links when setting a redirector
+- Auto-complete more than one tag
+- Bookmarklet: support titles containing quotes
+- URL encode links when setting a redirector
 
 
 ## [v0.6.0](https://github.com/shaarli/Shaarli/releases/tag/v0.6.0) - 2015-11-18
@@ -1279,8 +1279,8 @@ Initial release on GitHub.
 - In tag autocomplete, tags are presented in use order
   (most used tags first, instead of alphabetical order)
 - RSS Feed can now be filtered by tags or fulltext search. Just add to the feed url:
-  - `&searchtags=minecraft+video` for tag filtering
-  - `&searchterm=portal` for fulltext search to the feed url
+    - `&searchtags=minecraft+video` for tag filtering
+    - `&searchterm=portal` for fulltext search to the feed url
 
 
 ## [v0.0.12beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)