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

2018-01-02 00:11:41 -06:00

parent fa9b7ece2e 764f876953

commit 54148b9a4a

11 changed files with 41 additions and 9 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

0

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

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 32 KiB After Width:  |  Height:  |  Size: 32 KiB

BIN

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

Binary file not shown.

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

BIN

app/javascript/images/wave-modal.png Normal file

Binary file not shown.

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