Marien Fressinaud a97bbd9bd5 Merge branch 'dev' ...

Conflicts:
	CHANGELOG
	README.fr.md
	README.md
	app/Controllers/feedController.php
	app/Controllers/indexController.php
	app/i18n/en.php
	app/i18n/fr.php
	app/views/helpers/view/normal_view.phtml
	app/views/stats/index.phtml
	app/views/stats/repartition.phtml
	constants.php
	p/scripts/main.js

2015-01-31 14:45:37 +01:00

..

authController.php

Fix a call to $system_conf

2015-01-06 22:15:51 +01:00

categoryController.php

Fix calls to remove_query_by_get()

2015-01-07 15:37:24 +01:00

configureController.php

Fix setters on $user_conf

2015-01-06 21:54:46 +01:00

entryController.php

Change name of user configuration var in Context

2015-01-05 22:45:03 +01:00

errorController.php

Fix Minz_Error and error_Controller

2015-01-18 11:47:16 +01:00

extensionController.php

Fix coding style in extension manager

2015-01-14 23:40:18 +01:00

feedController.php

Merge branch 'dev' into 252-extensions

2015-01-08 14:18:32 +01:00

importExportController.php

Update lib_opml.php

2015-01-21 10:50:53 +01:00

indexController.php

Merge branch 'dev'

2015-01-31 14:45:37 +01:00

javascriptController.php

Fix calls to FreshRSS_Configuration

2015-01-06 21:40:19 +01:00

statsController.php

Update i18n for statistics

2014-12-11 16:10:39 +01:00

subscriptionController.php

Fix feed update with MySQL/MariaDB

2015-01-18 12:49:49 +01:00

updateController.php

Addressed warnings when reading from new files

2015-01-19 13:54:57 +01:00

userController.php

Fix a call to availableLanguages() (bad object)

2015-01-06 22:14:14 +01:00