Merge branch 'master' into legislation-module-stable

2017-01-11 22:54:41 +01:00
parent f7aca52706 6952e7eac6
commit a2a61341fe
235 changed files with 9717 additions and 656 deletions
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -180,6 +180,9 @@
 .icon-arrow-top:before {
  content: "\57";
 }
+.icon-help-1:before {
+  content: "\58";
+}
 .icon-checkmark-circle:before {
  content: "\59";
 }