]> 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: 776e00f a6f03e1)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Thu, 24 Jun 2021 06:08:02 +0000 (08:08 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Thu, 24 Jun 2021 06:08:02 +0000 (08:08 +0200)
1  2 
Gemfile.lock patch | diff1 | diff2 | blob | history
package.json patch | diff1 | diff2 | blob | history
yarn.lock patch | diff1 | diff2 | blob | history

diff --cc Gemfile.lock
Simple merge
diff --cc package.json
Simple merge
diff --cc yarn.lock
Simple merge
source code fur Kibicat Mastodon