You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 29b5c5f483 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Slight refactor upstream, next to a line that was different in glitch-soc because of our local configurable limits on custom emoji size. Ported upstream changes. - `yarn.lock`: Not really a conflict, upstream dependency textually too close to a glitch-soc-only dependency. Updated upstream dependency as upstream.		3 years ago
..
action_dispatch	…
active_record	…
assets	…
chewy/strategy	…
devise	…
generators	…
json_ld	…
mastodon	…
paperclip	…
rails	…
redis	…
sanitize_ext	…
tasks	…
templates	…
terrapin	…
webpacker	…
cli.rb	…
enumerable.rb	…
exceptions.rb	…