Merge branch 'master' into glitch-soc/tentative-merge

Browse Source

Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.

...

This commit is contained in:

Thibaut Girka

2018-07-09 07:05:29 +02:00

parent c699b2d141 1ca4e51eb3

commit d392020da6

3127 changed files with 7554 additions and 3945 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-fren.png

Binary file not shown.

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

BIN

app/javascript/images/mailer/icon_cached.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 582 B After Width:  |  Height:  |  Size: 423 B

BIN

app/javascript/images/mailer/icon_done.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 279 B After Width:  |  Height:  |  Size: 253 B

BIN

app/javascript/images/mailer/icon_email.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 520 B After Width:  |  Height:  |  Size: 387 B

BIN

app/javascript/images/mailer/icon_file_download.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 271 B After Width:  |  Height:  |  Size: 225 B

BIN

app/javascript/images/mailer/icon_grade.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 541 B After Width:  |  Height:  |  Size: 412 B

BIN

app/javascript/images/mailer/icon_lock_open.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 550 B After Width:  |  Height:  |  Size: 387 B

BIN

app/javascript/images/mailer/icon_person_add.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 512 B After Width:  |  Height:  |  Size: 376 B

BIN

app/javascript/images/mailer/icon_reply.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 391 B After Width:  |  Height:  |  Size: 319 B

BIN

app/javascript/images/mailer/logo_full.png

Binary file not shown.

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

BIN

app/javascript/images/mailer/logo_transparent.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 627 B After Width:  |  Height:  |  Size: 506 B

BIN

app/javascript/images/reticle.png

Binary file not shown.

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

BIN

app/javascript/images/void.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 174 B After Width:  |  Height:  |  Size: 174 B