From: nodiscc <nodiscc@gmail.com>
Date: Sun, 17 Dec 2017 22:43:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'nerostie/patch-2' into doc-overhaul
X-Git-Tag: v0.9.4~21^2~3
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=5faa0697dd080acba0604adc57127674382f1ac7;hp=-c;p=github%2Fshaarli%2FShaarli.git

Merge remote-tracking branch 'nerostie/patch-2' into doc-overhaul
---

5faa0697dd080acba0604adc57127674382f1ac7
diff --combined doc/md/Community-&-Related-software.md
index 3c55e935,ad38ac96..086af7c1
--- a/doc/md/Community-&-Related-software.md
+++ b/doc/md/Community-&-Related-software.md
@@@ -29,6 -29,7 +29,7 @@@ See [REST API](REST-API) for a list of 
  - [Code Coloration](https://github.com/ArthurHoaro/code-coloration) by [@ArthurHoaro](https://github.com/ArthurHoaro): client side code syntax highlighter.
  - [Disqus](https://github.com/kalvn/shaarli-plugin-disqus) by [@kalvn](https://github.com/kalvn): Adds Disqus comment system to your Shaarli.
  - [emojione](https://github.com/NerosTie/emojione) by [@NerosTie](https://github.com/NerosTie): Add colorful emojis to your Shaarli.
+ - [twemoji](https://github.com/NerosTie/twemoji) by [@NerosTie](https://github.com/NerosTie): Add colorful emojis to your Shaarli (Twemoji version) 
  - [google analytics](https://github.com/ericjuden/Shaarli-Google-Analytics-Plugin) by [@ericjuden](http://github.com/ericjuden): Adds Google Analytics tracking support
  - [launch](https://github.com/ArthurHoaro/launch-plugin) - Launch Plugin is a plugin designed to enhance and customize Launch Theme for Shaarli.
  - [related](https://github.com/ilesinge/shaarli-related) by [@ilesinge](https://github.com/ilesinge) - Show related links based on the number of identical tags.
@@@ -48,12 -49,10 +49,12 @@@ See [Theming](Theming) for a list of co
  
  
  ### Mobile Apps
 -- [ShaarliOS](https://github.com/mro/ShaarliOS) iOS share extension - see [#308](https://github.com/shaarli/Shaarli/issues/308#issuecomment-184592070) for some promo codes,
 +- [ShaarliOS](https://github.com/mro/ShaarliOS) - Apple iOS share extension.
  - [Shaarli for Android](http://sebsauvage.net/links/?ZAyDzg) - Android application that adds Shaarli as a sharing provider
  - [Shaarlier for Android](https://github.com/dimtion/Shaarlier) - Android application to simply add links directly into your Shaarli
  
 +### Browser addons
 + * [Shaarli Web Extension](https://github.com/ikipatang/shaarli-web-extension) - toolbar button to share your current tab with Shaarli.
  
  ### Server apps
  - [shaarchiver](https://github.com/nodiscc/shaarchiver) - Archive your Shaarli bookmarks and their content
@@@ -64,5 -63,7 +65,5 @@@
  - [Self dead link](https://github.com/qwertygc/shaarli-dev-code/blob/master/self-dead-link.php) - Detect dead links on shaarli. This version use the database of shaarli. [Another version](https://github.com/qwertygc/shaarli-dev-code/blob/master/dead-link.php), can be used for other shaarli instances (but is more resource consuming).
  - [Bookmark Archiver](https://github.com/pirate/bookmark-archiver) - Save an archived copy of all websites starred using browser bookmarks/Shaarli/Delicious/Instapaper/Unmark.it/Pocket/Pinboard. Outputs browseable html. 
  
 -
  ## Alternatives to Shaarli
 -See the [bookmarks & link sharing](https://github.com/Kickball/awesome-selfhosted/#bookmarks--link-sharing)
 -section on [awesome-selfhosted](https://github.com/Kickball/awesome-selfhosted/).
 +See [awesome-selfhosted: bookmarks & link sharing](https://github.com/Kickball/awesome-selfhosted/#bookmarks--link-sharing).