Merge pull request #8559 from ksooo/jarvis-string-resource-fix
authorMartijn Kaijser <martijn@xbmc.org>
Fri, 11 Dec 2015 13:36:02 +0000 (14:36 +0100)
committerMartijn Kaijser <martijn@xbmc.org>
Fri, 11 Dec 2015 13:36:02 +0000 (14:36 +0100)
commit2ce63e3e4eb88444c695424c2e04d806a58811a0
treee3015df09a7292e865cb9ef0b0e32d4c22f5a11a
parentb4646074a2f4321b57d708147e4f459dd4546a27
parent6c3e6fec364d961ad609a6b409be5e24ba03214f
Merge pull request #8559 from ksooo/jarvis-string-resource-fix

[confluence] String fix 'Timer' => 'Timers'