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

Browse Source

Conflicts:
	app/javascript/styles/mastodon/components.scss

...

This commit is contained in:

David Yip

2018-01-20 10:45:43 -06:00

parent 2ca965c704 0b7a0d15c7

commit 071c2c9c85

122 changed files with 819 additions and 694 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

app/javascript/images/elephant_ui_greeting.svg

+1

File diff suppressed because one or more lines are too long

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

app/javascript/images/mailer/icon_cached.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 754 B

app/javascript/images/mailer/icon_done.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 279 B

app/javascript/images/mailer/icon_email.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 520 B

app/javascript/images/mailer/icon_grade.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 541 B

app/javascript/images/mailer/icon_lock_open.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 550 B

app/javascript/images/mailer/icon_person_add.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 512 B

app/javascript/images/mailer/icon_reply.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 391 B

app/javascript/images/mailer/logo_full.png

BIN

Binary file not shown.

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

app/javascript/images/mailer/logo_transparent.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 627 B