Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop
Conflicts: db/schema.rb
This commit is contained in:
commit
ca363ca095
6 changed files with 21 additions and 4 deletions
6
db/migrate/20150922141000_add_state_to_dossier.rb
Normal file
6
db/migrate/20150922141000_add_state_to_dossier.rb
Normal file
|
@ -0,0 +1,6 @@
|
|||
class AddStateToDossier < ActiveRecord::Migration
|
||||
def change
|
||||
remove_column :dossiers, :dossier_termine
|
||||
add_column :dossiers, :state, :string
|
||||
end
|
||||
end
|
Loading…
Add table
Add a link
Reference in a new issue