]> 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: fd81916 99226ab)
Merge branch 'master' into fix/cache_blocking
authorEffy Elden <github@effy.is>
Sun, 16 Apr 2017 15:41:33 +0000 (01:41 +1000)
committerGitHub <noreply@github.com>
Sun, 16 Apr 2017 15:41:33 +0000 (01:41 +1000)
1  2 
app/models/status.rb patch | diff1 | diff2 | blob | history

diff --cc app/models/status.rb
Simple merge
source code fur Kibicat Mastodon