Mastodon

History

Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.

2018-12-15 10:45:53 +01:00

_mixins.scss

Allow joining several hashtags in a single column (#8904 )

2018-11-05 18:53:25 +01:00

about.scss

Revert Font Awesome 5 upgrade (#8810 )

2018-09-28 02:11:14 +02:00

accessibility.scss

Add a few black emojis that are to have a white outline (#8597 )

2018-09-10 18:26:47 +02:00

accounts.scss

Add profile directory (#9427 )