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

2016-07-25 17:44:46 -05:00 · 2016-07-25 17:44:46 -05:00 · 800d5bd4d4
parent 345090e933 3e23f27499
commit 800d5bd4d4
2 changed files with 4 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.2.17"
+        version="2.2.18"
        provider-name="Emby.media">
  <requires>
    <import addon="xbmc.python" version="2.1.0"/>
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,6 @@
+version 2.2.18
+- Fix logging
+
 version 2.2.17
 - Fix crash when device wakes up
 - Add option to disable external subs for direct stream - under add-on settings > playback