Merge pull request #332 from glitch-soc/merge-upstream

Browse Source

Merge in home feed regeneration changes from upstream

...

This commit is contained in:

David Yip

2018-01-18 22:00:11 -06:00

committed by GitHub

parent ae369bceb3 3896cd5d79

commit 26ecee79bf

51 changed files with 570 additions and 89 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

BIN

app/javascript/images/elephant-friend.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 24 KiB

1

app/javascript/images/elephant_ui_disappointed.svg Normal file

File diff suppressed because one or more lines are too long

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

1

app/javascript/images/elephant_ui_working.svg Normal file

File diff suppressed because one or more lines are too long

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

BIN

app/javascript/images/mastodon-not-found.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 19 KiB