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

Conflicts: db/schema.rb
2015-09-22 11:57:04 +02:00 · 2015-09-22 11:57:04 +02:00 · 9da4a33e62
commit 9da4a33e62
parent 5b9acf3875 94cfa8a139
6 changed files with 37 additions and 30 deletions
--- a/spec/factories/procedure.rb
+++ b/spec/factories/procedure.rb
@ -1,5 +1,7 @@
 FactoryGirl.define do
  factory :procedure do
+    libelle 'Demande de subvention'
+    description 'Description demande de subvention'
    lien_demarche 'http://localhost'
    libelle 'Demande de subvention'
    description "Demande de subvention à l'intention des associations"