]> git.wh0rd.org Git - tt-rss.git/commitdiff
Merge branch 'master' into german-translation
authorHeiko Adams <h.adams@heiko-adams.de>
Fri, 19 Aug 2016 15:25:05 +0000 (17:25 +0200)
committerHeiko Adams <h.adams@heiko-adams.de>
Fri, 19 Aug 2016 15:25:05 +0000 (17:25 +0200)

Trivial merge