]> 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: e1d29f7 5393b18)
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 29 Feb 2020 11:20:54 +0000 (12:20 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sat, 29 Feb 2020 11:20:54 +0000 (12:20 +0100)
1  2 
Gemfile.lock patch | diff1 | diff2 | blob | history
app/models/account.rb patch | diff1 | diff2 | blob | history

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