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

@ -0,0 +1,6 @@
class AddStateToDossier < ActiveRecord::Migration
def change
remove_column :dossiers, :dossier_termine
add_column :dossiers, :state, :string
end
end