]> 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: d30dd5b 81b19e2)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Fri, 7 May 2021 22:01:47 +0000 (00:01 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Fri, 7 May 2021 22:01:47 +0000 (00:01 +0200)
1  2 
app/models/account.rb patch | diff1 | diff2 | blob | history
db/schema.rb patch | diff1 | diff2 | blob | history
package.json patch | diff1 | diff2 | blob | history
yarn.lock patch | diff1 | diff2 | blob | history

diff --cc app/models/account.rb
Simple merge
diff --cc db/schema.rb
Simple merge
diff --cc package.json
Simple merge
diff --cc yarn.lock
Simple merge
source code fur Kibicat Mastodon