Jeremy Kescher 1661561640 Merge branch 'reactions' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/locales/de.js # app/javascript/flavours/glitch/locales/en.js # app/javascript/flavours/glitch/locales/es.js # app/javascript/flavours/glitch/locales/fr.js # app/javascript/flavours/glitch/locales/ja.js # app/javascript/flavours/glitch/locales/ko.js # app/javascript/flavours/glitch/locales/pl.js # app/javascript/flavours/glitch/locales/zh-CN.js # app/javascript/mastodon/actions/interactions.js # app/javascript/mastodon/locales/fr.json # db/migrate/20221124114030_create_status_reactions.rb		2022-12-22 00:18:36 +01:00
..
ISSUE_TEMPLATE	Correct prettier calls for YML/JSON (#21832)	2022-12-03 12:05:35 +09:00
workflows	Merge branch 'reactions' into develop	2022-12-22 00:18:36 +01:00
FUNDING.yml	Remove references to discourse.joinmastodon.org (#17797)	2022-03-15 08:13:22 +01:00
stale.yml	Change stale bot to only touch pull requests over 120 days old (#12217)	2019-10-26 12:45:52 +02:00
stylelint-matcher.json	Set-up Problem Matchers (#18598)	2022-06-16 22:09:43 +02:00