]> cat aescling's git repositories - mastodon.git/commitdiff
git-æsc / mastodon.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a942ad3 3fd808a)
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 29 Oct 2018 13:09:54 +0000 (14:09 +0100)
committerThibaut Girka <thib@sitedethib.com>
Mon, 29 Oct 2018 13:09:54 +0000 (14:09 +0100)
1  2 
Gemfile patch | diff1 | diff2 | blob | history
Gemfile.lock patch | diff1 | diff2 | blob | history

diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
source code fur Kibicat Mastodon
This page took 0.190277 seconds and 3 git commands to generate.