notify fixes
add imgsetsizes plugin
add af_tumblr_1280
Merge remote-tracking branch 'upstream/master'
de_DE l10n: Fix typo.
Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS
Merge pull request #422 from rwetzlmayr/master

de_DE l10n: Fix typo
Merge remote-tracking branch 'upstream/master'
allow embedding videos from youtube and vimeo natively
api: allow requesting headlines as if client supports iframe sandboxing
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
no_iframes: remove everything except good iframes
Modify query to avoid a full table scan on MySQL
Merge pull request #424 from tmo-github/TMO_ttrss

Modify query to avoid a full table scan on MySQL
api: getHeadlines: add configurable excerpt_length (bump api version)
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Merge remote-tracking branch 'upstream/master'