Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation

2017-05-22 18:43:49 +02:00
parent bf8651febc 6e71774504
commit 5e0d5fc8c3
177 changed files with 10710 additions and 125 deletions
--- a/3
+++ b/3
@@ -66,6 +66,9 @@ gem 'turnout', '~> 2.4.0'
 gem 'redcarpet', '~> 3.4.0'

 gem 'paperclip'
+gem 'rails-assets-markdown-it', source: 'https://rails-assets.org'
+
+gem 'cocoon'

 group :development, :test do
  # Call 'byebug' anywhere in the code to stop execution and get a debugger console