Xavier J 647eaa4ba8 Merge branch 'develop' into develop_v2 ... # Conflicts: # Gemfile.lock # db/schema.rb		2016-11-17 16:55:41 +01:00
..
environments	First fixed	2016-11-14 17:33:45 +01:00
initializers	Fix Test spec/controllers/api/*.rb	2016-11-15 09:54:17 +01:00
locales	Add reply_to for invite mailer	2016-11-17 12:17:59 +01:00
application.rb	test 2	2016-02-12 13:57:25 +01:00
boot.rb	First Commit	2015-08-10 11:05:06 +02:00
database.yml	add parallels tests	2015-12-21 10:45:50 +01:00
deploy.rb	Merge branch 'develop' into develop_v2	2016-11-17 16:55:41 +01:00
environment.rb	First Commit	2015-08-10 11:05:06 +02:00
fog_credentials.test.yml	Adding button, method in controller, testing call	2016-10-25 17:39:53 +02:00
routes.rb	Flux de commentaires par champs	2016-11-15 18:36:20 +01:00
secrets.yml	First Commit	2015-08-10 11:05:06 +02:00