]> cat aescling's git repositories - mastodon.git/commitdiff
cat aescling's git repositories / mastodon.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3398fa 9309c53)
Merge remote-tracking branch 'glitch-soc' into glitch-soc-v3.5.1
authorsingle-right-quote <34298117+single-right-quote@users.noreply.github.com>
Sat, 9 Apr 2022 00:06:38 +0000 (00:06 +0000)
committersingle-right-quote <34298117+single-right-quote@users.noreply.github.com>
Sat, 9 Apr 2022 00:06:38 +0000 (00:06 +0000)
Update to Mastodon 3.5.1, as merged into glitch-soc.

1  2 
app/models/user.rb patch | diff1 | diff2 | blob | history
lib/mastodon/version.rb patch | diff1 | diff2 | blob | history
yarn.lock patch | diff1 | diff2 | blob | history

diff --cc app/models/user.rb
Simple merge
diff --cc lib/mastodon/version.rb
Simple merge
diff --cc yarn.lock
Simple merge
source code fur Kibicat Mastodon