diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-07 17:00:36 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-07 17:00:36 +0200 |
| commit | 34b8346e7f1274d40734f9da3100a4343cf9f81c (patch) | |
| tree | 1a851db65a949df937de0a3eb4fce1e9f83e5301 /app/javascript/styles/mastodon/admin.scss | |
| parent | 83600198961cce9bfe82cf0f0c33286703bc86d1 (diff) | |
| parent | a60364ca7d26c82c9353980d0966d37e9aa66014 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb
Diffstat (limited to 'app/javascript/styles/mastodon/admin.scss')
| -rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 74f91599a..692d86852 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -171,7 +171,7 @@ $content-width: 840px; text-transform: none; padding-bottom: 0; margin-bottom: 0; - border-bottom: none; + border-bottom: 0; } & > p { |