This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
accounts	…
admin	…
announcements	…
apps	…
featured_tags	…
instances	…
lists	…
polls	…
push	…
statuses	…
timelines	…
accounts_controller.rb	…
announcements_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	…
conversations_controller.rb	…
custom_emojis_controller.rb	…
directories_controller.rb	…
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
instances_controller.rb	…
lists_controller.rb	…
markers_controller.rb	…
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	…
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	…
statuses_controller.rb	…
streaming_controller.rb	…
suggestions_controller.rb	…
trends_controller.rb	…