Xavier J 647eaa4ba8 Merge branch 'develop' into develop_v2 ... # Conflicts: # Gemfile.lock # db/schema.rb		2016-11-17 16:55:41 +01:00
..
images	New color for navbar	2016-11-15 14:10:43 +01:00
javascripts	Fix JS	2016-11-17 10:50:28 +01:00
stylesheets	Merge branch 'develop' into develop_v2	2016-11-17 16:55:41 +01:00