Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.
2018-12-09 13:28:09 +01:00
parent e3682c9c17 81bda7d67c
commit e7f1bfdc2d
47 changed files with 751 additions and 43 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -876,7 +876,8 @@
  }
 }

-.status__relative-time {
+.status__relative-time,
+.notification__relative_time {
  color: $dark-text-color;
  float: right;
  font-size: 14px;