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 21394c5462 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
..
direct_controller.rb	Added a timeline for Direct statuses	7 years ago
home_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
list_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
public_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
tag_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago