]> cat aescling's git repositories - mastodon.git/commitdiff
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
authorOndřej Hruška <ondra@ondrovo.com>
Mon, 16 Oct 2017 19:13:47 +0000 (21:13 +0200)
committerOndřej Hruška <ondra@ondrovo.com>
Mon, 16 Oct 2017 19:13:47 +0000 (21:13 +0200)
1  2 
app/lib/feed_manager.rb

Simple merge
This page took 0.028932 seconds and 3 git commands to generate.