Merge remote-tracking branch 'refs/remotes/origin/master' into develop

2016-11-03 03:48:13 -05:00 · 2016-11-03 03:48:13 -05:00 · 6c15f9f4bc
parent 464b1d4c79 225c7828fc
commit 6c15f9f4bc
2 changed files with 5 additions and 1 deletions
--- a/addon.xml
+++ b/addon.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.emby"
        name="Emby" 
-        version="2.3.5"
+        version="2.3.6"
        provider-name="Emby.media">
  <requires>
    <import addon="xbmc.python" version="2.19.0"/>
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,7 @@
+version 2.3.6
+- Update French translation
+- Fix screensaver bug
+
 version 2.3.4
 - add throttling for error event logging