Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source

Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss

...

This commit is contained in:

David Yip committed 2018-01-02 00:11:41 -06:00

2 parents fa9b7ece2e 764f876953

commit 54148b9a4a

11 files changed

+41 -9

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

No files matched your search

app/javascript/images/mastodon-drawer.png → app/javascript/images/mastodon-ui.png

File renamed without changes.

app/javascript/images/wave-compose-standalone.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.8 KiB

app/javascript/images/wave-modal.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.1 KiB