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
..
check-i18n.yml	See version file in GitHub Actions (#21927)	2022-12-07 00:30:59 +01:00
codeql.yml	Run Prettier on YML files (#22345)	2022-12-16 11:11:52 +09:00
linter.yml	See version file in GitHub Actions (#21927)	2022-12-07 00:30:59 +01:00
rebase-needed.yml	Add CI job to label PRs with merge conflicts (#22020)	2022-12-09 06:37:13 +01:00