]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e0d9432 166f6e4)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Tue, 22 Feb 2022 17:06:29 +0000 (18:06 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Tue, 22 Feb 2022 17:06:29 +0000 (18:06 +0100)
commit954e052b0727099be97552af577831a8a0f81a88
tree560526b10076fdfa31245fe8bfdd4a58303ae214tree | snapshot
parente0d94323bc8f6c5d249452e2baf1f103c15546b8commit | diff
parent166f6e4b500dd84eeffdbf887b2dc21e6d8c0aa6commit | diff
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/models/media_attachment.rb`:
  Upstream moved hardcoded values around, while in glitch-soc they are
  configurable.
  Moved them like upstream, but keeping glitch-soc's ability to configure
  them through env vars.
app/javascript/styles/mastodon/admin.scss diff1 | diff2 | blob | history
app/models/media_attachment.rb diff1 | diff2 | blob | history
source code fur Kibicat Mastodon