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 f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		6 years ago
..
account/components	Implement adding a user to a list from their profile (#9062)	6 years ago
account_gallery	…
account_timeline	Use local instead of global loading indicator for timelines, account timelines (#9224)	6 years ago
blocks	…
community_timeline	…
compose	…
direct_timeline	…
domain_blocks	…
emoji	…
favourited_statuses	…
favourites	…
follow_requests	…
followers	…
following	…
generic_not_found	…
getting_started	…
hashtag_timeline	Deep compare tags for hashtag column reload (#9297)	6 years ago
home_timeline	…
keyboard_shortcuts	…
list_adder	Implement adding a user to a list from their profile (#9062)	6 years ago
list_editor	…
list_timeline	…
lists	…
mutes	…
notifications	Fix loading indicator inconsistency (#9252)	6 years ago
pinned_statuses	…
public_timeline	…
reblogs	…
report	…
standalone	Allow joining several hashtags in a single column (#8904)	6 years ago
status	Fix null error introduced in #9270 (#9275)	6 years ago
ui	Implement adding a user to a list from their profile (#9062)	6 years ago
video	Volume sliders for videos #7429 (#9366)	6 years ago