Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop

Conflicts:
	db/schema.rb
This commit is contained in:
Tanguy PATTE 2015-09-23 10:02:54 +02:00
commit ca363ca095
6 changed files with 21 additions and 4 deletions

View file

@ -10,7 +10,6 @@ describe Dossier do
it { is_expected.to have_db_column(:montant_projet) }
it { is_expected.to have_db_column(:montant_aide_demande) }
it { is_expected.to have_db_column(:date_previsionnelle).of_type(:date) }
it { is_expected.to have_db_column(:dossier_termine) }
it { is_expected.to have_db_column(:created_at) }
it { is_expected.to have_db_column(:updated_at) }
end