From: Tom Hughes <tom@compton.nu>
Date: Mon, 30 Dec 2019 21:40:10 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2471'
X-Git-Tag: live~2450
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1c5642637a87ab250d2a1204cc83a578e7aa29f1

Merge remote-tracking branch 'upstream/pull/2471'
---

1c5642637a87ab250d2a1204cc83a578e7aa29f1
diff --cc app/assets/stylesheets/_bootstrap-custom.scss
index 6bbaecbe4,1c3629aa8..96d37415f
--- a/app/assets/stylesheets/_bootstrap-custom.scss
+++ b/app/assets/stylesheets/_bootstrap-custom.scss
@@@ -27,9 -27,9 +27,9 @@@
  @import "bootstrap/card";
  // @import "bootstrap/breadcrumb";
  // @import "bootstrap/pagination";
 -// @import "bootstrap/badge";
 +@import "bootstrap/badge";
  // @import "bootstrap/jumbotron";
- // @import "bootstrap/alert";
+ @import "bootstrap/alert";
  // @import "bootstrap/progress";
  // @import "bootstrap/media";
  // @import "bootstrap/list-group";