Sylvain 7ca1c841b6 Merge branch 'dev' into english ...

Conflicts:
	README.md
	app/assets/templates/shared/leftnav.html.erb

2016-01-27 11:09:58 +01:00

..

api

Translation 1

2016-01-18 01:48:28 +00:00

application

update fonts

2015-09-18 10:32:25 +02:00

devise

Making the translation neutral (no brands)

2016-01-18 12:49:59 +00:00

layouts

Making the translation neutral (no brands)

2016-01-18 12:49:59 +00:00

notifications_mailer

Translation 1

2016-01-18 01:48:28 +00:00

users_mailer

Making the translation neutral (no brands)

2016-01-18 12:49:59 +00:00