Merge remote-tracking branch 'origin/master' into gs-master

Browse Source

Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json

...

This commit is contained in:

David Yip

2018-04-18 18:48:12 -05:00

parent 813da6788e ff87d1bc3e

commit 16d5217502

124 changed files with 2089 additions and 995 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

353

app/javascript/styles/mastodon/components.scss

File diff suppressed because it is too large Load Diff