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.

David Yip eb39db7f93 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml		7 years ago
..
accounts	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
apps	…
instances	…
lists	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
statuses	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
timelines	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
accounts_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
custom_emojis_controller.rb	…
domain_blocks_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
favourites_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
follow_requests_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
follows_controller.rb	…
instances_controller.rb	…
lists_controller.rb	…
media_controller.rb	…
mutes_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
notifications_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
reports_controller.rb	…
search_controller.rb	…
statuses_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
streaming_controller.rb	…