Merge branch 'beta' into hotfixes
Fix bug on archiving page

Introduced by https://github.com/FreshRSS/FreshRSS/commit/ee5bbe48269a2fd5bc9c175fdb1e5a92a2c04502