small xss vulnerability and translation ability fix
small xss vulnerability and translation ability fix
Merge pull request #713 from mariroz/dev

small xss vulnerability and translation ability fix
fix of undefined ATOM constant warning in full-text-rss, will fix ios-app issue #14
Merge pull request #715 from mariroz/dev

fix of undefined ATOM constant warning in full-text-rss, will fix ios-app issue #14
error reporting level set in E_ALL & ~E_NOTICE by default, can be overriden in config
Merge pull request #716 from mariroz/dev

error reporting level set in E_ALL & ~E_NOTICE by default, can be overriden in config
do not debug inside an epub
up to date
Merge pull request #722 from tcitworld/dev

do not output debug while generating epub
typo FR
Merge pull request #724 from Draky50110/dev

typo FR
Typo FR (suite)
typo FR 3
Revert "Typo FR (suite)"

This reverts commit 7f186e21e0a121320485dca9c846b4c3df261deb.

Conflicts:
	locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
	locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
fin de correction typo FR
typo mineure
Merge pull request #728 from Draky50110/dev

typo FR après vérif.
fix of issue #718: Error parsing file imported from Pocket #718
Merge pull request #736 from mariroz/dev

fix of issue #718: Error parsing file imported from Pocket #718