Alexis Degrugillier 450df54d81 Merge branch 'stats' of https://github.com/aledeg/FreshRSS into stats ...

Conflicts:
	app/Controllers/statsController.php
	app/Models/StatsDAO.php
	app/i18n/en.php
	app/i18n/fr.php
	app/layout/aside_stats.phtml
	app/layout/header.phtml
	app/views/index/stats.phtml
	app/views/stats/idle.phtml
	app/views/stats/index.phtml
	app/views/stats/main.phtml

2014-06-15 12:20:57 -04:00

..

idle.phtml

Merge branch 'stats' of https://github.com/aledeg/FreshRSS into stats

2014-06-15 12:20:57 -04:00

index.phtml

Refactor and formatting

2014-06-15 12:13:33 -04:00

main.phtml

Refactor and formatting

2014-06-15 12:13:33 -04:00