Merge branch 'master' into patch-1

diff --cc doc/md/Community-&-Related-software.md
index 862970d4066f64df3b665b0bf0f77fc3fe51c96c,715a9022dfde7c02390214ae5b8d72d60204188b..49c20c9cebcdfcef5fbb530327af74f86ebbde52
--- 1/doc/md/Community-&-Related-software.md
--- 2/doc/md/Community-&-Related-software.md
+++ b/doc/md/Community-&-Related-software.md
@@@ -32,7 -32,7 +32,8 @@@ See [Theming](Theming) for a list of co
  - [tt-rss-shaarli](https://github.com/jcsaaddupuy/tt-rss-shaarli) - [Tiny-Tiny RSS](http://tt-rss.org/) plugin that adds support for sharing articles with Shaarli
  - [octopress-shaarli](https://github.com/ahmet2mir/octopress-shaarli) - Octopress plugin to retrieve Shaarli links on the sidebar
  - [Scuttle to Shaarli](https://github.com/q2apro/scuttle-to-shaarli) - Import bookmarks from Scuttle
 +- [Shaarli app for Cloudron](https://git.cloudron.io/cloudron/shaarli-app) - Effortlessly run Shaarli with the help of [Cloudron](https://cloudron.io/) [![Install](https://cloudron.io/img/button.svg)](https://cloudron.io/button.html?app=com.github.shaarli)
+ - [Shaarli_ynh](https://github.com/YunoHost-Apps/shaarli_ynh) - Shaarli is available as a [Yunohost](https://yunohost.org) app [![Install Shaarli with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=shaarli)
  
  ### Mobile Apps
  - [ShaarliOS](https://github.com/mro/ShaarliOS) - Apple iOS share extension.