]> 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: bed13f2 127bfda)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Tue, 26 Dec 2017 18:17:16 +0000 (18:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Tue, 26 Dec 2017 18:17:16 +0000 (18:17 +0000)
1  2 
Gemfile patch | diff1 | diff2 | blob | history
Gemfile.lock patch | diff1 | diff2 | blob | history
db/schema.rb patch | diff1 | diff2 | blob | history

diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
diff --cc db/schema.rb
Simple merge
source code fur Kibicat Mastodon