Merge branch 'assign_to_procedure' into develop

# Conflicts:
#	db/schema.rb
This commit is contained in:
Xavier J 2016-05-24 17:19:32 +02:00
commit e973286766
39 changed files with 578 additions and 101 deletions

View file

@ -13,6 +13,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
inflect.irregular 'piece_justificative', 'pieces_justificatives'
inflect.irregular 'type_de_piece_justificative', 'types_de_piece_justificative'
inflect.irregular 'type_de_champ', 'types_de_champ'
inflect.irregular 'assign_to', 'assign_tos'
end
# These inflection rules are supported but not enabled by default: