diff options
| author | Andrew Dolgov <[email protected]> | 2015-07-13 12:46:05 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-07-13 12:46:05 +0300 |
| commit | 4f9a3c0e0f995b5ad8eed5357df3d12beb8bee00 (patch) | |
| tree | 43b8e2eb0757095b80ed877ae1c379b7f0463f2e /index.php | |
| parent | c939dfc39645f6fd687dd926c50286eda4b2c2df (diff) | |
| parent | 402073d6a1845f5874da67aa055e733cd2ae693a (diff) | |
Merge branch 'master' of git.fakecake.org:tt-rss
Conflicts:
classes/pref/filters.php
Diffstat (limited to 'index.php')
| -rw-r--r-- | index.php | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -140,7 +140,6 @@ <div id="notify" class="notify"></div> <div id="cmdline" style="display : none"></div> -<div id="headlines-tmp" style="display : none"></div> <div id="main" dojoType="dijit.layout.BorderContainer"> |