]> git.wh0rd.org Git - tt-rss.git/commitdiff
Merge branch 'otp' of fturco/tt-rss into master
authorfox <fox+git@fakecake.org>
Fri, 22 Dec 2017 15:00:32 +0000 (15:00 +0000)
committerGogs <gogs@fake.local>
Fri, 22 Dec 2017 15:00:32 +0000 (15:00 +0000)

Trivial merge