]> 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: e42ed45 e54a650)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Sat, 17 Jul 2021 15:45:35 +0000 (17:45 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Sat, 17 Jul 2021 15:45:35 +0000 (17:45 +0200)
1  2 
app/lib/formatter.rb patch | diff1 | diff2 | blob | history
app/models/account.rb patch | diff1 | diff2 | blob | history

diff --cc app/lib/formatter.rb
Simple merge
diff --cc app/models/account.rb
Simple merge
source code fur Kibicat Mastodon