logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: b68fb3dc172a2cb13c07d7e42351947ecade1e3b
parent: 0d14def0ca781b79ffb3c1022472ac64f990cdf8
Author: kaniini <nenolod@gmail.com>
Date:   Thu, 21 Mar 2019 00:59:24 +0000

Merge branch 'imageoptim' into 'develop'

used imageOptim to reduce size of image files

See merge request pleroma/pleroma!944

Diffstat:

Mpriv/static/emoji/Firefox.gif0
Mpriv/static/emoji/blank.png0
Mpriv/static/emoji/f_00b.png0
Mpriv/static/emoji/f_00b11b.png0
Mpriv/static/emoji/f_00b33b.png0
Mpriv/static/emoji/f_00h.png0
Mpriv/static/emoji/f_00t.png0
Mpriv/static/emoji/f_01b.png0
Mpriv/static/emoji/f_03b.png0
Mpriv/static/emoji/f_10b.png0
Mpriv/static/emoji/f_11b.png0
Mpriv/static/emoji/f_11b00b.png0
Mpriv/static/emoji/f_11b22b.png0
Mpriv/static/emoji/f_11h.png0
Mpriv/static/emoji/f_11t.png0
Mpriv/static/emoji/f_12b.png0
Mpriv/static/emoji/f_21b.png0
Mpriv/static/emoji/f_22b.png0
Mpriv/static/emoji/f_22b11b.png0
Mpriv/static/emoji/f_22b33b.png0
Mpriv/static/emoji/f_22h.png0
Mpriv/static/emoji/f_22t.png0
Mpriv/static/emoji/f_23b.png0
Mpriv/static/emoji/f_30b.png0
Mpriv/static/emoji/f_32b.png0
Mpriv/static/emoji/f_33b.png0
Mpriv/static/emoji/f_33b00b.png0
Mpriv/static/emoji/f_33b22b.png0
Mpriv/static/emoji/f_33h.png0
Mpriv/static/emoji/f_33t.png0
Mpriv/static/favicon.png0
Mpriv/static/finmoji/1000px/a_trusted_friend.png0
Mpriv/static/finmoji/1000px/alandislands.png0
Mpriv/static/finmoji/1000px/association.png0
Mpriv/static/finmoji/1000px/auroraborealis.png0
Mpriv/static/finmoji/1000px/baby_in_a_box.png0
Mpriv/static/finmoji/1000px/bear.png0
Mpriv/static/finmoji/1000px/black_gold.png0
Mpriv/static/finmoji/1000px/christmasparty.png0
Mpriv/static/finmoji/1000px/crosscountryskiing.png0
Mpriv/static/finmoji/1000px/cupofcoffee.png0
Mpriv/static/finmoji/1000px/education.png0
Mpriv/static/finmoji/1000px/fashionista_finns.png0
Mpriv/static/finmoji/1000px/finnishlove.png0
Mpriv/static/finmoji/1000px/flag.png0
Mpriv/static/finmoji/1000px/forest.png0
Mpriv/static/finmoji/1000px/four_seasons_of_bbq.png0
Mpriv/static/finmoji/1000px/girlpower.png0
Mpriv/static/finmoji/1000px/handshake.png0
Mpriv/static/finmoji/1000px/happiness.png0
Mpriv/static/finmoji/1000px/headbanger.png0
Mpriv/static/finmoji/1000px/icebreaker.png0
Mpriv/static/finmoji/1000px/iceman.png0
Mpriv/static/finmoji/1000px/joulutorttu.png0
Mpriv/static/finmoji/1000px/kaamos.png0
Mpriv/static/finmoji/1000px/kalsarikannit_f.png0
Mpriv/static/finmoji/1000px/kalsarikannit_m.png0
Mpriv/static/finmoji/1000px/karjalanpiirakka.png0
Mpriv/static/finmoji/1000px/kicksled.png0
Mpriv/static/finmoji/1000px/kokko.png0
Mpriv/static/finmoji/1000px/lavatanssit.png0
Mpriv/static/finmoji/1000px/losthopes_f.png0
Mpriv/static/finmoji/1000px/losthopes_m.png0
Mpriv/static/finmoji/1000px/mattinykanen.png0
Mpriv/static/finmoji/1000px/meanwhileinfinland.png0
Mpriv/static/finmoji/1000px/moominmamma.png0
Mpriv/static/finmoji/1000px/nordicfamily.png0
Mpriv/static/finmoji/1000px/out_of_office.png0
Mpriv/static/finmoji/1000px/peacemaker.png0
Mpriv/static/finmoji/1000px/perkele.png0
Mpriv/static/finmoji/1000px/pesapallo.png0
Mpriv/static/finmoji/1000px/polarbear.png0
Mpriv/static/finmoji/1000px/pusa_hispida_saimensis.png0
Mpriv/static/finmoji/1000px/reindeer.png0
Mpriv/static/finmoji/1000px/sami.png0
Mpriv/static/finmoji/1000px/sauna_f.png0
Mpriv/static/finmoji/1000px/sauna_m.png0
Mpriv/static/finmoji/1000px/sauna_whisk.png0
Mpriv/static/finmoji/1000px/sisu.png0
Mpriv/static/finmoji/1000px/stuck.png0
Mpriv/static/finmoji/1000px/suomimainittu.png0
Mpriv/static/finmoji/1000px/superfood.png0
Mpriv/static/finmoji/1000px/swan.png0
Mpriv/static/finmoji/1000px/the_cap.png0
Mpriv/static/finmoji/1000px/the_conductor.png0
Mpriv/static/finmoji/1000px/the_king.png0
Mpriv/static/finmoji/1000px/the_voice.png0
Mpriv/static/finmoji/1000px/theoriginalsanta.png0
Mpriv/static/finmoji/1000px/tomoffinland.png0
Mpriv/static/finmoji/1000px/torillatavataan.png0
Mpriv/static/finmoji/1000px/unbreakable.png0
Mpriv/static/finmoji/1000px/waiting.png0
Mpriv/static/finmoji/1000px/white_nights.png0
Mpriv/static/finmoji/1000px/woollysocks.png0
Mpriv/static/finmoji/128px/a_trusted_friend-128.png0
Mpriv/static/finmoji/128px/alandislands-128.png0
Mpriv/static/finmoji/128px/association-128.png0
Mpriv/static/finmoji/128px/auroraborealis-128.png0
Mpriv/static/finmoji/128px/baby_in_a_box-128.png0
Mpriv/static/finmoji/128px/bear-128.png0
Mpriv/static/finmoji/128px/black_gold-128.png0
Mpriv/static/finmoji/128px/christmasparty-128.png0
Mpriv/static/finmoji/128px/crosscountryskiing-128.png0
Mpriv/static/finmoji/128px/cupofcoffee-128.png0
Mpriv/static/finmoji/128px/education-128.png0
Mpriv/static/finmoji/128px/fashionista_finns-128.png0
Mpriv/static/finmoji/128px/finnishlove-128.png0
Mpriv/static/finmoji/128px/flag-128.png0
Mpriv/static/finmoji/128px/forest-128.png0
Mpriv/static/finmoji/128px/four_seasons_of_bbq-128.png0
Mpriv/static/finmoji/128px/girlpower-128.png0
Mpriv/static/finmoji/128px/handshake-128.png0
Mpriv/static/finmoji/128px/happiness-128.png0
Mpriv/static/finmoji/128px/headbanger-128.png0
Mpriv/static/finmoji/128px/icebreaker-128.png0
Mpriv/static/finmoji/128px/iceman-128.png0
Mpriv/static/finmoji/128px/joulutorttu-128.png0
Mpriv/static/finmoji/128px/kaamos-128.png0
Mpriv/static/finmoji/128px/kalsarikannit_f-128.png0
Mpriv/static/finmoji/128px/kalsarikannit_m-128.png0
Mpriv/static/finmoji/128px/karjalanpiirakka-128.png0
Mpriv/static/finmoji/128px/kicksled-128.png0
Mpriv/static/finmoji/128px/kokko-128.png0
Mpriv/static/finmoji/128px/lavatanssit-128.png0
Mpriv/static/finmoji/128px/losthopes_f-128.png0
Mpriv/static/finmoji/128px/losthopes_m-128.png0
Mpriv/static/finmoji/128px/mattinykanen-128.png0
Mpriv/static/finmoji/128px/meanwhileinfinland-128.png0
Mpriv/static/finmoji/128px/moominmamma-128.png0
Mpriv/static/finmoji/128px/nordicfamily-128.png0
Mpriv/static/finmoji/128px/out_of_office-128.png0
Mpriv/static/finmoji/128px/peacemaker-128.png0
Mpriv/static/finmoji/128px/perkele-128.png0
Mpriv/static/finmoji/128px/pesapallo-128.png0
Mpriv/static/finmoji/128px/polarbear-128.png0
Mpriv/static/finmoji/128px/pusa_hispida_saimensis-128.png0
Mpriv/static/finmoji/128px/reindeer-128.png0
Mpriv/static/finmoji/128px/sami-128.png0
Mpriv/static/finmoji/128px/sauna_f-128.png0
Mpriv/static/finmoji/128px/sauna_m-128.png0
Mpriv/static/finmoji/128px/sauna_whisk-128.png0
Mpriv/static/finmoji/128px/sisu-128.png0
Mpriv/static/finmoji/128px/stuck-128.png0
Mpriv/static/finmoji/128px/suomimainittu-128.png0
Mpriv/static/finmoji/128px/superfood-128.png0
Mpriv/static/finmoji/128px/swan-128.png0
Mpriv/static/finmoji/128px/the_cap-128.png0
Mpriv/static/finmoji/128px/the_conductor-128.png0
Mpriv/static/finmoji/128px/the_king-128.png0
Mpriv/static/finmoji/128px/the_voice-128.png0
Mpriv/static/finmoji/128px/theoriginalsanta-128.png0
Mpriv/static/finmoji/128px/tomoffinland-128.png0
Mpriv/static/finmoji/128px/torillatavataan-128.png0
Mpriv/static/finmoji/128px/unbreakable-128.png0
Mpriv/static/finmoji/128px/waiting-128.png0
Mpriv/static/finmoji/128px/white_nights-128.png0
Mpriv/static/finmoji/128px/woollysocks-128.png0
Mpriv/static/images/avi.png0
Mpriv/static/images/banner.png0
Mpriv/static/images/city.jpg0
Mpriv/static/instance/thumbnail.jpeg0
Mpriv/static/packs/clippy_frame-3446d4d28d72aef2f64f7fabae30eb4a.png0
Mpriv/static/packs/clippy_wave-afb828463da264adbce26a3f17731f6c.gif0
Mpriv/static/packs/glitch-preview-bb9cc15a0102bfaf65712e5cff7e58df.jpg0
Mpriv/static/packs/icon_about-ffafc67a2e97ca436da6c1bf61a8ab68.png0
Mpriv/static/packs/icon_blocks-0b0e54d45ff0177b02e1357ac09c0d51.png0
Mpriv/static/packs/icon_cached-26ffa26120a2a16a9be78a75cc603793.png0
Mpriv/static/packs/icon_done-e07ea253e82d137816cfb8d77a3b1562.png0
Mpriv/static/packs/icon_email-ed5d2a37fa765e4c5fec080a82b0a783.png0
Mpriv/static/packs/icon_file_download-0b212ed1bca11e1e02539a20b3821d87.png0
Mpriv/static/packs/icon_follow_requests-32eaf00987b072b2b12f8015d6a6a250.png0
Mpriv/static/packs/icon_grade-1f9e039d0f024626ab071d18098b65a0.png0
Mpriv/static/packs/icon_home-433b9d93fc1f035ec09330c2512a4879.png0
Mpriv/static/packs/icon_keyboard_shortcuts-4b183486762cfcc9f0de7522520a5485.png0
Mpriv/static/packs/icon_likes-27b8551da2d56d81062818c035ed622e.png0
Mpriv/static/packs/icon_lists-ae69bf4fb26c40d2c9b056c55c9153e2.png0
Mpriv/static/packs/icon_local-eade3ebeb7ac50f798cd40ed5fe62232.png0
Mpriv/static/packs/icon_lock_open-d377f10d3f005d0d042a1ee1dee8284d.png0
Mpriv/static/packs/icon_logout-3abd28c4fc25290e6e4088c50d3352f4.png0
Mpriv/static/packs/icon_mutes-5e7612d5c63fedb3fc59558284304cfc.png0
Mpriv/static/packs/icon_person_add-44d0a8dfa7dce95be5f6e3cfe0cdd133.png0
Mpriv/static/packs/icon_pin-79e04b07bcaa1266eee3164e83f574b4.png0
Mpriv/static/packs/icon_public-2d798a39bb2bd6314e47b00669686556.png0
Mpriv/static/packs/icon_reply-1c00f97d10006dd420bc620b26a79d8a.png0
Mpriv/static/packs/icon_settings-e7c53fb8ee137f93827e2db21f507cb1.png0
Mpriv/static/packs/icon_warning-af2b38fe580f274ca4c80479bd12141e.png0
Mpriv/static/packs/logo_full-efefe08462ede002abb7fc1e69005cbb.png0
Mpriv/static/packs/logo_transparent-73bf4bea5ad08ce44d516e472dc452c1.png0
Mpriv/static/packs/reticle-6490ecbb61185e86e62dca0845cf2dcf.png0
Mpriv/static/packs/screenshot-752460e373ba6c7519109936bd0656f6.jpg0
Mpriv/static/packs/start-d443e819b6248a54c6eb466c75938306.png0
Mpriv/static/packs/void-4c8270c17facce6d53726a2ebb9745f2.png0
Mpriv/static/packs/wave-drawer-ee1bfcbe5811ea31771b7187c7507ee6.png0
Mpriv/static/packs/wave-drawer-glitched-33467bf8c8d2b995d6c76d8810aba3db.png0
Mpriv/static/static/aurora_borealis.jpg0
Mpriv/static/static/bg2.jpg0
Mpriv/static/static/bgalt.jpg0
Mpriv/static/static/img/nsfw.74818f9.png0
Mpriv/static/static/logo.png0
Mtest/fixtures/image.jpg0
Mtest/upload_test.exs2+-
201 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/priv/static/emoji/Firefox.gif b/priv/static/emoji/Firefox.gif Binary files differ. diff --git a/priv/static/emoji/blank.png b/priv/static/emoji/blank.png Binary files differ. diff --git a/priv/static/emoji/f_00b.png b/priv/static/emoji/f_00b.png Binary files differ. diff --git a/priv/static/emoji/f_00b11b.png b/priv/static/emoji/f_00b11b.png Binary files differ. diff --git a/priv/static/emoji/f_00b33b.png b/priv/static/emoji/f_00b33b.png Binary files differ. diff --git a/priv/static/emoji/f_00h.png b/priv/static/emoji/f_00h.png Binary files differ. diff --git a/priv/static/emoji/f_00t.png b/priv/static/emoji/f_00t.png Binary files differ. diff --git a/priv/static/emoji/f_01b.png b/priv/static/emoji/f_01b.png Binary files differ. diff --git a/priv/static/emoji/f_03b.png b/priv/static/emoji/f_03b.png Binary files differ. diff --git a/priv/static/emoji/f_10b.png b/priv/static/emoji/f_10b.png Binary files differ. diff --git a/priv/static/emoji/f_11b.png b/priv/static/emoji/f_11b.png Binary files differ. diff --git a/priv/static/emoji/f_11b00b.png b/priv/static/emoji/f_11b00b.png Binary files differ. diff --git a/priv/static/emoji/f_11b22b.png b/priv/static/emoji/f_11b22b.png Binary files differ. diff --git a/priv/static/emoji/f_11h.png b/priv/static/emoji/f_11h.png Binary files differ. diff --git a/priv/static/emoji/f_11t.png b/priv/static/emoji/f_11t.png Binary files differ. diff --git a/priv/static/emoji/f_12b.png b/priv/static/emoji/f_12b.png Binary files differ. diff --git a/priv/static/emoji/f_21b.png b/priv/static/emoji/f_21b.png Binary files differ. diff --git a/priv/static/emoji/f_22b.png b/priv/static/emoji/f_22b.png Binary files differ. diff --git a/priv/static/emoji/f_22b11b.png b/priv/static/emoji/f_22b11b.png Binary files differ. diff --git a/priv/static/emoji/f_22b33b.png b/priv/static/emoji/f_22b33b.png Binary files differ. diff --git a/priv/static/emoji/f_22h.png b/priv/static/emoji/f_22h.png Binary files differ. diff --git a/priv/static/emoji/f_22t.png b/priv/static/emoji/f_22t.png Binary files differ. diff --git a/priv/static/emoji/f_23b.png b/priv/static/emoji/f_23b.png Binary files differ. diff --git a/priv/static/emoji/f_30b.png b/priv/static/emoji/f_30b.png Binary files differ. diff --git a/priv/static/emoji/f_32b.png b/priv/static/emoji/f_32b.png Binary files differ. diff --git a/priv/static/emoji/f_33b.png b/priv/static/emoji/f_33b.png Binary files differ. diff --git a/priv/static/emoji/f_33b00b.png b/priv/static/emoji/f_33b00b.png Binary files differ. diff --git a/priv/static/emoji/f_33b22b.png b/priv/static/emoji/f_33b22b.png Binary files differ. diff --git a/priv/static/emoji/f_33h.png b/priv/static/emoji/f_33h.png Binary files differ. diff --git a/priv/static/emoji/f_33t.png b/priv/static/emoji/f_33t.png Binary files differ. diff --git a/priv/static/favicon.png b/priv/static/favicon.png Binary files differ. diff --git a/priv/static/finmoji/1000px/a_trusted_friend.png b/priv/static/finmoji/1000px/a_trusted_friend.png Binary files differ. diff --git a/priv/static/finmoji/1000px/alandislands.png b/priv/static/finmoji/1000px/alandislands.png Binary files differ. diff --git a/priv/static/finmoji/1000px/association.png b/priv/static/finmoji/1000px/association.png Binary files differ. diff --git a/priv/static/finmoji/1000px/auroraborealis.png b/priv/static/finmoji/1000px/auroraborealis.png Binary files differ. diff --git a/priv/static/finmoji/1000px/baby_in_a_box.png b/priv/static/finmoji/1000px/baby_in_a_box.png Binary files differ. diff --git a/priv/static/finmoji/1000px/bear.png b/priv/static/finmoji/1000px/bear.png Binary files differ. diff --git a/priv/static/finmoji/1000px/black_gold.png b/priv/static/finmoji/1000px/black_gold.png Binary files differ. diff --git a/priv/static/finmoji/1000px/christmasparty.png b/priv/static/finmoji/1000px/christmasparty.png Binary files differ. diff --git a/priv/static/finmoji/1000px/crosscountryskiing.png b/priv/static/finmoji/1000px/crosscountryskiing.png Binary files differ. diff --git a/priv/static/finmoji/1000px/cupofcoffee.png b/priv/static/finmoji/1000px/cupofcoffee.png Binary files differ. diff --git a/priv/static/finmoji/1000px/education.png b/priv/static/finmoji/1000px/education.png Binary files differ. diff --git a/priv/static/finmoji/1000px/fashionista_finns.png b/priv/static/finmoji/1000px/fashionista_finns.png Binary files differ. diff --git a/priv/static/finmoji/1000px/finnishlove.png b/priv/static/finmoji/1000px/finnishlove.png Binary files differ. diff --git a/priv/static/finmoji/1000px/flag.png b/priv/static/finmoji/1000px/flag.png Binary files differ. diff --git a/priv/static/finmoji/1000px/forest.png b/priv/static/finmoji/1000px/forest.png Binary files differ. diff --git a/priv/static/finmoji/1000px/four_seasons_of_bbq.png b/priv/static/finmoji/1000px/four_seasons_of_bbq.png Binary files differ. diff --git a/priv/static/finmoji/1000px/girlpower.png b/priv/static/finmoji/1000px/girlpower.png Binary files differ. diff --git a/priv/static/finmoji/1000px/handshake.png b/priv/static/finmoji/1000px/handshake.png Binary files differ. diff --git a/priv/static/finmoji/1000px/happiness.png b/priv/static/finmoji/1000px/happiness.png Binary files differ. diff --git a/priv/static/finmoji/1000px/headbanger.png b/priv/static/finmoji/1000px/headbanger.png Binary files differ. diff --git a/priv/static/finmoji/1000px/icebreaker.png b/priv/static/finmoji/1000px/icebreaker.png Binary files differ. diff --git a/priv/static/finmoji/1000px/iceman.png b/priv/static/finmoji/1000px/iceman.png Binary files differ. diff --git a/priv/static/finmoji/1000px/joulutorttu.png b/priv/static/finmoji/1000px/joulutorttu.png Binary files differ. diff --git a/priv/static/finmoji/1000px/kaamos.png b/priv/static/finmoji/1000px/kaamos.png Binary files differ. diff --git a/priv/static/finmoji/1000px/kalsarikannit_f.png b/priv/static/finmoji/1000px/kalsarikannit_f.png Binary files differ. diff --git a/priv/static/finmoji/1000px/kalsarikannit_m.png b/priv/static/finmoji/1000px/kalsarikannit_m.png Binary files differ. diff --git a/priv/static/finmoji/1000px/karjalanpiirakka.png b/priv/static/finmoji/1000px/karjalanpiirakka.png Binary files differ. diff --git a/priv/static/finmoji/1000px/kicksled.png b/priv/static/finmoji/1000px/kicksled.png Binary files differ. diff --git a/priv/static/finmoji/1000px/kokko.png b/priv/static/finmoji/1000px/kokko.png Binary files differ. diff --git a/priv/static/finmoji/1000px/lavatanssit.png b/priv/static/finmoji/1000px/lavatanssit.png Binary files differ. diff --git a/priv/static/finmoji/1000px/losthopes_f.png b/priv/static/finmoji/1000px/losthopes_f.png Binary files differ. diff --git a/priv/static/finmoji/1000px/losthopes_m.png b/priv/static/finmoji/1000px/losthopes_m.png Binary files differ. diff --git a/priv/static/finmoji/1000px/mattinykanen.png b/priv/static/finmoji/1000px/mattinykanen.png Binary files differ. diff --git a/priv/static/finmoji/1000px/meanwhileinfinland.png b/priv/static/finmoji/1000px/meanwhileinfinland.png Binary files differ. diff --git a/priv/static/finmoji/1000px/moominmamma.png b/priv/static/finmoji/1000px/moominmamma.png Binary files differ. diff --git a/priv/static/finmoji/1000px/nordicfamily.png b/priv/static/finmoji/1000px/nordicfamily.png Binary files differ. diff --git a/priv/static/finmoji/1000px/out_of_office.png b/priv/static/finmoji/1000px/out_of_office.png Binary files differ. diff --git a/priv/static/finmoji/1000px/peacemaker.png b/priv/static/finmoji/1000px/peacemaker.png Binary files differ. diff --git a/priv/static/finmoji/1000px/perkele.png b/priv/static/finmoji/1000px/perkele.png Binary files differ. diff --git a/priv/static/finmoji/1000px/pesapallo.png b/priv/static/finmoji/1000px/pesapallo.png Binary files differ. diff --git a/priv/static/finmoji/1000px/polarbear.png b/priv/static/finmoji/1000px/polarbear.png Binary files differ. diff --git a/priv/static/finmoji/1000px/pusa_hispida_saimensis.png b/priv/static/finmoji/1000px/pusa_hispida_saimensis.png Binary files differ. diff --git a/priv/static/finmoji/1000px/reindeer.png b/priv/static/finmoji/1000px/reindeer.png Binary files differ. diff --git a/priv/static/finmoji/1000px/sami.png b/priv/static/finmoji/1000px/sami.png Binary files differ. diff --git a/priv/static/finmoji/1000px/sauna_f.png b/priv/static/finmoji/1000px/sauna_f.png Binary files differ. diff --git a/priv/static/finmoji/1000px/sauna_m.png b/priv/static/finmoji/1000px/sauna_m.png Binary files differ. diff --git a/priv/static/finmoji/1000px/sauna_whisk.png b/priv/static/finmoji/1000px/sauna_whisk.png Binary files differ. diff --git a/priv/static/finmoji/1000px/sisu.png b/priv/static/finmoji/1000px/sisu.png Binary files differ. diff --git a/priv/static/finmoji/1000px/stuck.png b/priv/static/finmoji/1000px/stuck.png Binary files differ. diff --git a/priv/static/finmoji/1000px/suomimainittu.png b/priv/static/finmoji/1000px/suomimainittu.png Binary files differ. diff --git a/priv/static/finmoji/1000px/superfood.png b/priv/static/finmoji/1000px/superfood.png Binary files differ. diff --git a/priv/static/finmoji/1000px/swan.png b/priv/static/finmoji/1000px/swan.png Binary files differ. diff --git a/priv/static/finmoji/1000px/the_cap.png b/priv/static/finmoji/1000px/the_cap.png Binary files differ. diff --git a/priv/static/finmoji/1000px/the_conductor.png b/priv/static/finmoji/1000px/the_conductor.png Binary files differ. diff --git a/priv/static/finmoji/1000px/the_king.png b/priv/static/finmoji/1000px/the_king.png Binary files differ. diff --git a/priv/static/finmoji/1000px/the_voice.png b/priv/static/finmoji/1000px/the_voice.png Binary files differ. diff --git a/priv/static/finmoji/1000px/theoriginalsanta.png b/priv/static/finmoji/1000px/theoriginalsanta.png Binary files differ. diff --git a/priv/static/finmoji/1000px/tomoffinland.png b/priv/static/finmoji/1000px/tomoffinland.png Binary files differ. diff --git a/priv/static/finmoji/1000px/torillatavataan.png b/priv/static/finmoji/1000px/torillatavataan.png Binary files differ. diff --git a/priv/static/finmoji/1000px/unbreakable.png b/priv/static/finmoji/1000px/unbreakable.png Binary files differ. diff --git a/priv/static/finmoji/1000px/waiting.png b/priv/static/finmoji/1000px/waiting.png Binary files differ. diff --git a/priv/static/finmoji/1000px/white_nights.png b/priv/static/finmoji/1000px/white_nights.png Binary files differ. diff --git a/priv/static/finmoji/1000px/woollysocks.png b/priv/static/finmoji/1000px/woollysocks.png Binary files differ. diff --git a/priv/static/finmoji/128px/a_trusted_friend-128.png b/priv/static/finmoji/128px/a_trusted_friend-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/alandislands-128.png b/priv/static/finmoji/128px/alandislands-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/association-128.png b/priv/static/finmoji/128px/association-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/auroraborealis-128.png b/priv/static/finmoji/128px/auroraborealis-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/baby_in_a_box-128.png b/priv/static/finmoji/128px/baby_in_a_box-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/bear-128.png b/priv/static/finmoji/128px/bear-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/black_gold-128.png b/priv/static/finmoji/128px/black_gold-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/christmasparty-128.png b/priv/static/finmoji/128px/christmasparty-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/crosscountryskiing-128.png b/priv/static/finmoji/128px/crosscountryskiing-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/cupofcoffee-128.png b/priv/static/finmoji/128px/cupofcoffee-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/education-128.png b/priv/static/finmoji/128px/education-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/fashionista_finns-128.png b/priv/static/finmoji/128px/fashionista_finns-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/finnishlove-128.png b/priv/static/finmoji/128px/finnishlove-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/flag-128.png b/priv/static/finmoji/128px/flag-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/forest-128.png b/priv/static/finmoji/128px/forest-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/four_seasons_of_bbq-128.png b/priv/static/finmoji/128px/four_seasons_of_bbq-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/girlpower-128.png b/priv/static/finmoji/128px/girlpower-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/handshake-128.png b/priv/static/finmoji/128px/handshake-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/happiness-128.png b/priv/static/finmoji/128px/happiness-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/headbanger-128.png b/priv/static/finmoji/128px/headbanger-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/icebreaker-128.png b/priv/static/finmoji/128px/icebreaker-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/iceman-128.png b/priv/static/finmoji/128px/iceman-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/joulutorttu-128.png b/priv/static/finmoji/128px/joulutorttu-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/kaamos-128.png b/priv/static/finmoji/128px/kaamos-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/kalsarikannit_f-128.png b/priv/static/finmoji/128px/kalsarikannit_f-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/kalsarikannit_m-128.png b/priv/static/finmoji/128px/kalsarikannit_m-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/karjalanpiirakka-128.png b/priv/static/finmoji/128px/karjalanpiirakka-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/kicksled-128.png b/priv/static/finmoji/128px/kicksled-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/kokko-128.png b/priv/static/finmoji/128px/kokko-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/lavatanssit-128.png b/priv/static/finmoji/128px/lavatanssit-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/losthopes_f-128.png b/priv/static/finmoji/128px/losthopes_f-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/losthopes_m-128.png b/priv/static/finmoji/128px/losthopes_m-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/mattinykanen-128.png b/priv/static/finmoji/128px/mattinykanen-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/meanwhileinfinland-128.png b/priv/static/finmoji/128px/meanwhileinfinland-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/moominmamma-128.png b/priv/static/finmoji/128px/moominmamma-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/nordicfamily-128.png b/priv/static/finmoji/128px/nordicfamily-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/out_of_office-128.png b/priv/static/finmoji/128px/out_of_office-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/peacemaker-128.png b/priv/static/finmoji/128px/peacemaker-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/perkele-128.png b/priv/static/finmoji/128px/perkele-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/pesapallo-128.png b/priv/static/finmoji/128px/pesapallo-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/polarbear-128.png b/priv/static/finmoji/128px/polarbear-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/pusa_hispida_saimensis-128.png b/priv/static/finmoji/128px/pusa_hispida_saimensis-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/reindeer-128.png b/priv/static/finmoji/128px/reindeer-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/sami-128.png b/priv/static/finmoji/128px/sami-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/sauna_f-128.png b/priv/static/finmoji/128px/sauna_f-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/sauna_m-128.png b/priv/static/finmoji/128px/sauna_m-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/sauna_whisk-128.png b/priv/static/finmoji/128px/sauna_whisk-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/sisu-128.png b/priv/static/finmoji/128px/sisu-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/stuck-128.png b/priv/static/finmoji/128px/stuck-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/suomimainittu-128.png b/priv/static/finmoji/128px/suomimainittu-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/superfood-128.png b/priv/static/finmoji/128px/superfood-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/swan-128.png b/priv/static/finmoji/128px/swan-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/the_cap-128.png b/priv/static/finmoji/128px/the_cap-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/the_conductor-128.png b/priv/static/finmoji/128px/the_conductor-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/the_king-128.png b/priv/static/finmoji/128px/the_king-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/the_voice-128.png b/priv/static/finmoji/128px/the_voice-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/theoriginalsanta-128.png b/priv/static/finmoji/128px/theoriginalsanta-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/tomoffinland-128.png b/priv/static/finmoji/128px/tomoffinland-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/torillatavataan-128.png b/priv/static/finmoji/128px/torillatavataan-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/unbreakable-128.png b/priv/static/finmoji/128px/unbreakable-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/waiting-128.png b/priv/static/finmoji/128px/waiting-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/white_nights-128.png b/priv/static/finmoji/128px/white_nights-128.png Binary files differ. diff --git a/priv/static/finmoji/128px/woollysocks-128.png b/priv/static/finmoji/128px/woollysocks-128.png Binary files differ. diff --git a/priv/static/images/avi.png b/priv/static/images/avi.png Binary files differ. diff --git a/priv/static/images/banner.png b/priv/static/images/banner.png Binary files differ. diff --git a/priv/static/images/city.jpg b/priv/static/images/city.jpg Binary files differ. diff --git a/priv/static/instance/thumbnail.jpeg b/priv/static/instance/thumbnail.jpeg Binary files differ. diff --git a/priv/static/packs/clippy_frame-3446d4d28d72aef2f64f7fabae30eb4a.png b/priv/static/packs/clippy_frame-3446d4d28d72aef2f64f7fabae30eb4a.png Binary files differ. diff --git a/priv/static/packs/clippy_wave-afb828463da264adbce26a3f17731f6c.gif b/priv/static/packs/clippy_wave-afb828463da264adbce26a3f17731f6c.gif Binary files differ. diff --git a/priv/static/packs/glitch-preview-bb9cc15a0102bfaf65712e5cff7e58df.jpg b/priv/static/packs/glitch-preview-bb9cc15a0102bfaf65712e5cff7e58df.jpg Binary files differ. diff --git a/priv/static/packs/icon_about-ffafc67a2e97ca436da6c1bf61a8ab68.png b/priv/static/packs/icon_about-ffafc67a2e97ca436da6c1bf61a8ab68.png Binary files differ. diff --git a/priv/static/packs/icon_blocks-0b0e54d45ff0177b02e1357ac09c0d51.png b/priv/static/packs/icon_blocks-0b0e54d45ff0177b02e1357ac09c0d51.png Binary files differ. diff --git a/priv/static/packs/icon_cached-26ffa26120a2a16a9be78a75cc603793.png b/priv/static/packs/icon_cached-26ffa26120a2a16a9be78a75cc603793.png Binary files differ. diff --git a/priv/static/packs/icon_done-e07ea253e82d137816cfb8d77a3b1562.png b/priv/static/packs/icon_done-e07ea253e82d137816cfb8d77a3b1562.png Binary files differ. diff --git a/priv/static/packs/icon_email-ed5d2a37fa765e4c5fec080a82b0a783.png b/priv/static/packs/icon_email-ed5d2a37fa765e4c5fec080a82b0a783.png Binary files differ. diff --git a/priv/static/packs/icon_file_download-0b212ed1bca11e1e02539a20b3821d87.png b/priv/static/packs/icon_file_download-0b212ed1bca11e1e02539a20b3821d87.png Binary files differ. diff --git a/priv/static/packs/icon_follow_requests-32eaf00987b072b2b12f8015d6a6a250.png b/priv/static/packs/icon_follow_requests-32eaf00987b072b2b12f8015d6a6a250.png Binary files differ. diff --git a/priv/static/packs/icon_grade-1f9e039d0f024626ab071d18098b65a0.png b/priv/static/packs/icon_grade-1f9e039d0f024626ab071d18098b65a0.png Binary files differ. diff --git a/priv/static/packs/icon_home-433b9d93fc1f035ec09330c2512a4879.png b/priv/static/packs/icon_home-433b9d93fc1f035ec09330c2512a4879.png Binary files differ. diff --git a/priv/static/packs/icon_keyboard_shortcuts-4b183486762cfcc9f0de7522520a5485.png b/priv/static/packs/icon_keyboard_shortcuts-4b183486762cfcc9f0de7522520a5485.png Binary files differ. diff --git a/priv/static/packs/icon_likes-27b8551da2d56d81062818c035ed622e.png b/priv/static/packs/icon_likes-27b8551da2d56d81062818c035ed622e.png Binary files differ. diff --git a/priv/static/packs/icon_lists-ae69bf4fb26c40d2c9b056c55c9153e2.png b/priv/static/packs/icon_lists-ae69bf4fb26c40d2c9b056c55c9153e2.png Binary files differ. diff --git a/priv/static/packs/icon_local-eade3ebeb7ac50f798cd40ed5fe62232.png b/priv/static/packs/icon_local-eade3ebeb7ac50f798cd40ed5fe62232.png Binary files differ. diff --git a/priv/static/packs/icon_lock_open-d377f10d3f005d0d042a1ee1dee8284d.png b/priv/static/packs/icon_lock_open-d377f10d3f005d0d042a1ee1dee8284d.png Binary files differ. diff --git a/priv/static/packs/icon_logout-3abd28c4fc25290e6e4088c50d3352f4.png b/priv/static/packs/icon_logout-3abd28c4fc25290e6e4088c50d3352f4.png Binary files differ. diff --git a/priv/static/packs/icon_mutes-5e7612d5c63fedb3fc59558284304cfc.png b/priv/static/packs/icon_mutes-5e7612d5c63fedb3fc59558284304cfc.png Binary files differ. diff --git a/priv/static/packs/icon_person_add-44d0a8dfa7dce95be5f6e3cfe0cdd133.png b/priv/static/packs/icon_person_add-44d0a8dfa7dce95be5f6e3cfe0cdd133.png Binary files differ. diff --git a/priv/static/packs/icon_pin-79e04b07bcaa1266eee3164e83f574b4.png b/priv/static/packs/icon_pin-79e04b07bcaa1266eee3164e83f574b4.png Binary files differ. diff --git a/priv/static/packs/icon_public-2d798a39bb2bd6314e47b00669686556.png b/priv/static/packs/icon_public-2d798a39bb2bd6314e47b00669686556.png Binary files differ. diff --git a/priv/static/packs/icon_reply-1c00f97d10006dd420bc620b26a79d8a.png b/priv/static/packs/icon_reply-1c00f97d10006dd420bc620b26a79d8a.png Binary files differ. diff --git a/priv/static/packs/icon_settings-e7c53fb8ee137f93827e2db21f507cb1.png b/priv/static/packs/icon_settings-e7c53fb8ee137f93827e2db21f507cb1.png Binary files differ. diff --git a/priv/static/packs/icon_warning-af2b38fe580f274ca4c80479bd12141e.png b/priv/static/packs/icon_warning-af2b38fe580f274ca4c80479bd12141e.png Binary files differ. diff --git a/priv/static/packs/logo_full-efefe08462ede002abb7fc1e69005cbb.png b/priv/static/packs/logo_full-efefe08462ede002abb7fc1e69005cbb.png Binary files differ. diff --git a/priv/static/packs/logo_transparent-73bf4bea5ad08ce44d516e472dc452c1.png b/priv/static/packs/logo_transparent-73bf4bea5ad08ce44d516e472dc452c1.png Binary files differ. diff --git a/priv/static/packs/reticle-6490ecbb61185e86e62dca0845cf2dcf.png b/priv/static/packs/reticle-6490ecbb61185e86e62dca0845cf2dcf.png Binary files differ. diff --git a/priv/static/packs/screenshot-752460e373ba6c7519109936bd0656f6.jpg b/priv/static/packs/screenshot-752460e373ba6c7519109936bd0656f6.jpg Binary files differ. diff --git a/priv/static/packs/start-d443e819b6248a54c6eb466c75938306.png b/priv/static/packs/start-d443e819b6248a54c6eb466c75938306.png Binary files differ. diff --git a/priv/static/packs/void-4c8270c17facce6d53726a2ebb9745f2.png b/priv/static/packs/void-4c8270c17facce6d53726a2ebb9745f2.png Binary files differ. diff --git a/priv/static/packs/wave-drawer-ee1bfcbe5811ea31771b7187c7507ee6.png b/priv/static/packs/wave-drawer-ee1bfcbe5811ea31771b7187c7507ee6.png Binary files differ. diff --git a/priv/static/packs/wave-drawer-glitched-33467bf8c8d2b995d6c76d8810aba3db.png b/priv/static/packs/wave-drawer-glitched-33467bf8c8d2b995d6c76d8810aba3db.png Binary files differ. diff --git a/priv/static/static/aurora_borealis.jpg b/priv/static/static/aurora_borealis.jpg Binary files differ. diff --git a/priv/static/static/bg2.jpg b/priv/static/static/bg2.jpg Binary files differ. diff --git a/priv/static/static/bgalt.jpg b/priv/static/static/bgalt.jpg Binary files differ. diff --git a/priv/static/static/img/nsfw.74818f9.png b/priv/static/static/img/nsfw.74818f9.png Binary files differ. diff --git a/priv/static/static/logo.png b/priv/static/static/logo.png Binary files differ. diff --git a/test/fixtures/image.jpg b/test/fixtures/image.jpg Binary files differ. diff --git a/test/upload_test.exs b/test/upload_test.exs @@ -56,7 +56,7 @@ defmodule Pleroma.UploadTest do assert List.first(data["url"])["href"] == Pleroma.Web.base_url() <> - "/media/e7a6d0cf595bff76f14c9a98b6c199539559e8b844e02e51e5efcfd1f614a2df.jpg" + "/media/e30397b58d226d6583ab5b8b3c5defb0c682bda5c31ef07a9f57c1c4986e3781.jpg" end test "copies the file to the configured folder without deduping" do