Sylvain 74154cf1f3 Merge branch 'xls' into dev ... Conflicts: CHANGELOG.md app/helpers/application_helper.rb config/locales/en.yml config/locales/fr.yml		2016-07-25 16:56:22 +02:00
..
_form.html.erb	release 2.0 rc	2016-03-23 18:39:41 +01:00
edit.html.erb	add notification and alert when user wallet credit	2016-07-21 16:32:54 +02:00
index.html.erb	change export links to xlsx	2016-07-12 13:41:19 +02:00
new.html.erb	release 2.0 rc	2016-03-23 18:39:41 +01:00