]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Fri, 8 Apr 2022 21:00:03 +0000 (23:00 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Fri, 8 Apr 2022 21:00:03 +0000 (23:00 +0200)
1  2 
app/controllers/api/v2/search_controller.rb
lib/mastodon/version.rb

Simple merge