Merge branch 'master' into 'master'

Please add Ocelot

See merge request fdroid/fdroiddata!2757

metadata/org.shirakumo.ocelot.txt

@@ -0,0 +1,28 @@
+Categories:Internet
+License:Artistic-2.0
+Author Name:Shirakumo
+Author Email:shirakumo@tymoon.eu
+Web Site:https://github.com/Shirakumo/ocelot
+Source Code:https://github.com/Shirakumo/ocelot
+Issue Tracker:https://github.com/Shirakumo/ocelot/issues
+
+Auto Name:Ocelot
+Description:
+A chat client for the Lichat protocol.
+
+This supports the full Lichat 1.3 protocol, including the extensions for data,
+emotes, and backfill.
+.
+
+Repo Type:git
+Repo:https://github.com/Shirakumo/ocelot
+
+Build:0.1,1
+    commit=0.1
+    subdir=app
+    gradle=yes
+
+Auto Update Mode:Version %v
+Update Check Mode:Tags
+Current Version:1.0
+Current Version Code:1