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

Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		5 years ago
..
actions	Add follow_request notification type (#12198)	5 years ago
components	Fix media open hotkey (#12546)	5 years ago
containers	Fix account dropdown not opening due to regression from #12377 (#12430)	5 years ago
features	Merge branch 'master' into glitch-soc/master	5 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
middleware	…
reducers	Add follow_request notification type (#12198)	5 years ago
selectors	…
service_worker	Add follow_request notification type (#12198)	5 years ago
storage	…
store	…
utils	…
api.js	…
base_polyfills.js	…
common.js	…
compare_id.js	…
extra_polyfills.js	fix multiple space (#12655)	5 years ago
initial_state.js	…
is_mobile.js	…
load_keyboard_extensions.js	fix: support KaiOS arrow navigation on public pages (#12251)	5 years ago
load_polyfills.js	…
main.js	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	…
settings.js	…
stream.js	upgrade/replace websocket.js to @gamestdio/websocket v2 (#12543)	5 years ago
test_setup.js	…
uuid.js	…