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

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index e0082a26aa0cf354564bfb1e734e740b00a88f9b..2054649776c8b50d146e35da3b0987b275be6f4a 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -14,7 +14,6 @@ $darkgrey: #888;
 $headerHeight: 55px;
 $sidebarWidth: 350px;
 $list-highlight: #FFFFC0;
-$border: 1px solid $grey;
 
 $link-color: #24d;
 $link-hover-color: #24d;