]> 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: 933eafd 886829e)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Sun, 3 Dec 2017 21:17:13 +0000 (21:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Sun, 3 Dec 2017 21:17:13 +0000 (21:17 +0000)
1  2 
package.json patch | diff1 | diff2 | blob | history
yarn.lock patch | diff1 | diff2 | blob | history

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