]> 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: 5fdd5ee 89077fb)
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Fri, 17 Apr 2020 18:16:24 +0000 (20:16 +0200)
committerThibaut Girka <thib@sitedethib.com>
Fri, 17 Apr 2020 18:16:24 +0000 (20:16 +0200)
1  2 
app/models/account.rb patch | diff1 | diff2 | blob | history
db/schema.rb patch | diff1 | diff2 | blob | history

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