]> git.wh0rd.org Git - tt-rss.git/commitdiff
Merge branch 'master' of MatthieuS/tt-rss into master
authorfox <fox+git@fakecake.org>
Wed, 23 May 2018 09:08:15 +0000 (09:08 +0000)
committerGogs <gogs@fake.local>
Wed, 23 May 2018 09:08:15 +0000 (09:08 +0000)

Trivial merge