Xavier J 647eaa4ba8 Merge branch 'develop' into develop_v2 ... # Conflicts: # Gemfile.lock # db/schema.rb		2016-11-17 16:55:41 +01:00
..
v1	Merge branch 'develop' into develop_v2	2016-11-17 16:55:41 +01:00
statistiques_spec.rb	Add statistiques API for dashboard	2016-02-29 15:15:44 +01:00