Romain Neutron 1dfbff5666 Merge branch '3.8' ...

Conflicts:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css

2013-10-03 15:29:22 +02:00

..

access.html.twig

Login page geonames plugin integration

2013-07-03 18:34:34 +02:00

account.html.twig

Add FtpCredentials entity

2013-08-23 12:09:50 +02:00

authorized_apps.html.twig

Fix #1510 : Fix API application status display

2013-10-03 12:20:02 +02:00

base.html.twig

Fix assets path

2013-08-17 17:12:57 +02:00

change-password.html.twig

Concatenate JS files

2013-06-17 15:39:46 +02:00

reset-email.html.twig

Login page geonames plugin integration

2013-07-03 18:34:34 +02:00

sessions.html.twig

Fix #1413 Add possibility to delete a persistent session

2013-08-08 12:26:39 +02:00

templates.html.twig

Add renew email form validation

2013-06-17 12:09:01 +02:00