Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		2019-07-23 10:51:07 +02:00
..
account/components	Play animated custom emoji on hover (#11348)	2019-07-21 18:10:40 +02:00
account_gallery	…
account_timeline	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
blocks	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
community_timeline	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
compose	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
direct_timeline	…
domain_blocks	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
emoji	Play animated custom emoji on hover (#11348)	2019-07-21 18:10:40 +02:00
favourited_statuses	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
favourites	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
follow_requests	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
followers	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
following	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
generic_not_found	…
getting_started	…
hashtag_timeline	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
home_timeline	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
introduction	…
keyboard_shortcuts	…
list_adder	…
list_editor	…
list_timeline	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
lists	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
mutes	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
notifications	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
pinned_statuses	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
public_timeline	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
reblogs	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
report	…
search	…
standalone	…
status	…
ui	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
video	…