]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 00889b3 fc3ae13)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Wed, 29 Sep 2021 22:01:20 +0000 (00:01 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Wed, 29 Sep 2021 22:01:20 +0000 (00:01 +0200)
commit29b5c5f4830f9bda0af352b1d6ac73830a6cfd4e
tree899cb5f54098d08f28dad2c8ee555b3557dead16tree | snapshot
parent00889b313176308018d66e54b5cb7dcc92da1587commit | diff
parentfc3ae1343df5adb83a3733958a4436981feb380fcommit | diff
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/models/custom_emoji.rb`:
  Slight refactor upstream, next to a line that was different in glitch-soc
  because of our local configurable limits on custom emoji size.
  Ported upstream changes.
- `yarn.lock`:
  Not really a conflict, upstream dependency textually too close to a
  glitch-soc-only dependency.
  Updated upstream dependency as upstream.
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
app/models/account.rb diff1 | diff2 | blob | history
app/models/custom_emoji.rb diff1 | diff2 | blob | history
app/models/media_attachment.rb diff1 | diff2 | blob | history
package.json diff1 | diff2 | blob | history
yarn.lock diff1 | diff2 | blob | history
source code fur Kibicat Mastodon