]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0220065 5159ba2)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Wed, 13 Oct 2021 13:50:24 +0000 (15:50 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Wed, 13 Oct 2021 13:50:24 +0000 (15:50 +0200)
commit1665b842856811c16b904c3b99be6b141a0e1c7b
tree6fba595782a93008ed3dd6f3ac9e19b7271df6b3tree | snapshot
parent022006577027ca040f4411489821f2e3311f0db6commit | diff
parent5159ba26e485daaeded2288c1b02bd1e516e1ca6commit | diff
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `package.json`:
  Not really a conflict, just a glitch-soc-only dependency textually too close
  to an updated upstream one.
- `yarn.lock`:
  Not really a conflict, just a glitch-soc-only dependency textually too close
  to an updated upstream one.
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
app/controllers/media_controller.rb diff1 | diff2 | blob | history
app/models/media_attachment.rb diff1 | diff2 | blob | history
package.json diff1 | diff2 | blob | history
streaming/index.js diff1 | diff2 | blob | history
yarn.lock diff1 | diff2 | blob | history
source code fur Kibicat Mastodon