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 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		6 years ago
..
account/components	…
account_gallery	…
account_timeline	…
blocks	…
community_timeline	…
compose	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
direct_timeline	…
domain_blocks	…
emoji	…
favourited_statuses	…
favourites	…
follow_requests	…
followers	…
following	…
generic_not_found	…
getting_started	…
hashtag_timeline	…
home_timeline	…
introduction	…
keyboard_shortcuts	…
list_adder	…
list_editor	…
list_timeline	…
lists	…
mutes	…
notifications	…
pinned_statuses	…
public_timeline	…
reblogs	…
report	…
search	…
standalone	…
status	…
ui	…
video	…