Merge branch 'develop' into france_connect

# Conflicts:
#	db/schema.rb
This commit is contained in:
Xavier J 2015-10-08 16:54:21 +02:00
commit 285d7c6fa0
24 changed files with 415 additions and 361 deletions

View file

@ -0,0 +1,5 @@
class AddUseAPICartoToProcedure < ActiveRecord::Migration
def change
add_column :procedures, :use_api_carto, :boolean, :default => false
end
end