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 bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.		6 years ago
..
_mixins.scss	…
about.scss	Apply style for .landing-page strong (#9892)	6 years ago
accessibility.scss	…
accounts.scss	Add featured hashtags to profiles (#9755)	6 years ago
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
basics.scss	…
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
containers.scss	Fix new hashtag page's items not being full-width on mobile (#9852)	6 years ago
dashboard.scss	…
emoji_picker.scss	…
footer.scss	…
forms.scss	Fix slightly cropped font on settings page dropdowns when using system font (#9839)	6 years ago
introduction.scss	…
lists.scss	…
modal.scss	…
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	6 years ago
rtl.scss	…
stream_entries.scss	…
tables.scss	…
variables.scss	…
widgets.scss	Add featured hashtags to profiles (#9755)	6 years ago