Sylvain 7f050223eb Merge branch 'hotfix' into dev ...

Conflicts:
	CHANGELOG.md

2016-05-24 14:59:07 +02:00

..

api

[bug] project gain collaborator i18n key FR

2016-05-18 10:54:50 +02:00

application

[bug] Google Analytics not loaded

2016-05-24 14:53:07 +02:00

devise/mailer

release 2.0 rc

2016-03-23 18:39:41 +01:00

layouts

release 2.0 rc

2016-03-23 18:39:41 +01:00

notifications_mailer

[bug] invalid link in migration email

2016-03-30 16:48:47 +02:00

users_mailer

release 2.0 rc

2016-03-23 18:39:41 +01:00