Merge branch 'legislation-module-stable' into sandbox-html

2016-12-27 12:36:10 +01:00
parent eed8f1dd83 704dffe7c5
commit e03522e267
80 changed files with 1933 additions and 144 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -48,6 +48,7 @@
 //= require social_share
 //= require markdown-it
 //= require markdown_editor
+//= require cocoon
 //= require allegations
 //= require custom