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

..

application_helper.rb

Merge branch 'xls' into dev

2016-07-25 16:56:22 +02:00

availability_helper.rb

show availability with reservation state

2016-07-14 12:20:02 +02:00

upload_helper.rb

release 2.0 rc

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