tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.
This commit is contained in:
Claire committed 2022-05-03 10:16:49 +02:00
2 parents cb9a919ff2 7e244879fe
commit 3869daef09
67 files changed
+1518 -892
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/javascript/styles/mastodon/components.scss
+1 -1
View File
@@ -4053,7 +4053,7 @@ a.status-card.compact:hover {
}
& > span {
max-width: 400px;
max-width: 500px;
}
a {