]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Fri, 4 Mar 2022 00:07:49 +0000 (01:07 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Fri, 4 Mar 2022 00:07:49 +0000 (01:07 +0100)
1  2 
app/lib/formatter.rb
app/workers/feed_insert_worker.rb
spec/views/about/show.html.haml_spec.rb

Simple merge
Simple merge