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 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		6 years ago
..
accounts	…
apps	…
lists	…
push	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
timelines	Lint pass (#8876)	6 years ago
accounts_controller_spec.rb	Lint pass (#8876)	6 years ago
apps_controller_spec.rb	…
blocks_controller_spec.rb	…
bookmarks_controller_spec.rb	…
custom_emojis_controller_spec.rb	…
domain_blocks_controller_spec.rb	…
favourites_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
filter_controller_spec.rb	…
follow_requests_controller_spec.rb	…
follows_controller_spec.rb	…
instances_controller_spec.rb	…
lists_controller_spec.rb	…
media_controller_spec.rb	…
mutes_controller_spec.rb	…
notifications_controller_spec.rb	…
reports_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
search_controller_spec.rb	…
statuses_controller_spec.rb	…
streaming_controller_spec.rb	Lint pass (#8876)	6 years ago
suggestions_controller_spec.rb	…