DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	db/schema.rb
This commit is contained in:
Tanguy PATTE 2015-09-22 11:57:04 +02:00
commit 9da4a33e62
6 changed files with 37 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
db/schema.rb
View file

@ -110,7 +110,7 @@ ActiveRecord::Schema.define(version: 20150922085811) do
t.integer "type_de_piece_justificative_id"
end
add_index "pieces_justificatives", ["type_de_piece_justificative_id"], name: "index_pieces_justificatives_on_type_de_piece_justificative_id", using: :btree
add_index "pieces_justificatives", ["type_de_piece_justificative_id"], name: "index_pieces_justificatives_on_type_piece_jointe_id", using: :btree
create_table "procedures", force: :cascade do |t|
t.string "libelle"