Thibaut Girka aaec64a500 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 - config/locales/simple_form.en.yml		2019-06-26 23:19:22 +02:00
..
core
flavours	Scroll to compose form rather than reply indicator on focus	2019-06-26 10:46:11 +02:00
fonts
images
locales
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00
packs
skins
styles