]> git.wh0rd.org - tt-rss.git/commitdiff
Merge branch 'master' of git.fakecake.org:tt-rss
authorAndrew Dolgov <noreply@fakecake.org>
Mon, 3 Aug 2015 16:21:12 +0000 (19:21 +0300)
committerAndrew Dolgov <noreply@fakecake.org>
Mon, 3 Aug 2015 16:21:12 +0000 (19:21 +0300)
1  2 
plugins/instances/init.php

Simple merge