about summary refs log tree commit diff
path: root/public/mstile-150x150.png
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-09 07:05:29 +0200
committerThibaut Girka <thib@sitedethib.com>2018-07-09 07:13:59 +0200
commitd392020da6ff4511a2925b327de23933f374bea3 (patch)
treee86a590276a96ef72d5ed49f79998e7680969cb6 /public/mstile-150x150.png
parentc699b2d141d7aa910bd81ae5fe881ecec7039395 (diff)
parent1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff)
Merge branch 'master' into glitch-soc/tentative-merge
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.
Diffstat (limited to 'public/mstile-150x150.png')
-rw-r--r--public/mstile-150x150.pngbin5621 -> 4523 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
index b6cd056c0..a4994062d 100644
--- a/public/mstile-150x150.png
+++ b/public/mstile-150x150.png
Binary files differ