Added propagation of $fetch_last_content_type for curl- and file_get_contents-calls
Merge pull request #143 from mbirth/master

Return Content-Type with fetch_file_contents()
Escape ']]>' (closing CDATA tag) when exporting with import_export plugin
Merge pull request #144 from lotrfan/import_export_fix

[import_export plugin] Escape ']]>' (closing CDATA tag) when exporting feeds
pre: forbid layout breaking width
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Revert "Revert "another attempt to workaround against feedtree scroll issues""

This reverts commit 9b176694f5ce928ac76984a3b1518353aa9cad5a.

Conflicts:
	tt-rss.css
Merge remote-tracking branch 'upstream/master'