Merge remote-tracking branch 'upstream/develop' into feature/frontend_refactor

2020-03-10 16:24:43 -05:00
parent bccb9a6f9c fadc08fbad
commit 316b5c8d0f
19 changed files with 123 additions and 218 deletions
--- a/app/javascript/styles/gabsocial/components.scss
+++ b/app/javascript/styles/gabsocial/components.scss
@@ -167,4 +167,4 @@ noscript {
  100% {
    opacity: 1;
  }
-}
+}