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.

Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder		7 years ago
..
actions	Completely hide toots matched by “irreversible” filters even if they got to the client (#11113)	7 years ago
components	Change audio format from ogg to mp3 for wider compatibility (#11141)	7 years ago
containers	Add confirm modal for unboosting toots (#10287)	7 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
middleware	…
reducers	Fix “mark as sensitive” not being used in delete & redraft (#10980)	7 years ago
selectors	Completely hide toots matched by “irreversible” filters even if they got to the client (#11113)	7 years ago
service_worker	…
storage	…
store	…
utils	…
api.js	…
base_polyfills.js	…
common.js	…
compare_id.js	…
extra_polyfills.js	…
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
is_mobile.js	…
load_polyfills.js	…
main.js	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	…
settings.js	…
stream.js	Improve streaming server security (#10818)	7 years ago
test_setup.js	…
uuid.js	…