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

Browse Source

Conflicts:
	app/javascript/images/mastodon-drawer.png
	app/javascript/styles/mastodon/components.scss

...

This commit is contained in:

David Yip

2017-12-26 22:24:19 -06:00

parent 7347bc7334 65f30f65a2

commit 7174d1c955

8 changed files with 34 additions and 25 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-getting-started.png → app/javascript/images/mastodon-drawer.png

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

BIN

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

Binary file not shown.

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