Merge remote-tracking branch 'pleroma/develop' into feature/disable-account

2019-04-22 13:08:30 +07:00 · 2019-04-22 13:08:30 +07:00 · e8c2f9a73a
commit e8c2f9a73a
parent 38926a063a 7fcbda702e
705 changed files with 4242 additions and 66080 deletions
--- a/priv/static/finmoji/1000px/a_trusted_friend.png
+++ b/priv/static/finmoji/1000px/a_trusted_friend.png
--- a/priv/static/finmoji/1000px/alandislands.png
+++ b/priv/static/finmoji/1000px/alandislands.png
--- a/priv/static/finmoji/1000px/association.png
+++ b/priv/static/finmoji/1000px/association.png
--- a/priv/static/finmoji/1000px/auroraborealis.png
+++ b/priv/static/finmoji/1000px/auroraborealis.png
--- a/priv/static/finmoji/1000px/baby_in_a_box.png
+++ b/priv/static/finmoji/1000px/baby_in_a_box.png
--- a/priv/static/finmoji/1000px/bear.png
+++ b/priv/static/finmoji/1000px/bear.png
--- a/priv/static/finmoji/1000px/black_gold.png
+++ b/priv/static/finmoji/1000px/black_gold.png
--- a/priv/static/finmoji/1000px/christmasparty.png
+++ b/priv/static/finmoji/1000px/christmasparty.png
--- a/priv/static/finmoji/1000px/crosscountryskiing.png
+++ b/priv/static/finmoji/1000px/crosscountryskiing.png
--- a/priv/static/finmoji/1000px/cupofcoffee.png
+++ b/priv/static/finmoji/1000px/cupofcoffee.png
--- a/priv/static/finmoji/1000px/education.png
+++ b/priv/static/finmoji/1000px/education.png
--- a/priv/static/finmoji/1000px/fashionista_finns.png
+++ b/priv/static/finmoji/1000px/fashionista_finns.png
--- a/priv/static/finmoji/1000px/finnishlove.png
+++ b/priv/static/finmoji/1000px/finnishlove.png
--- a/priv/static/finmoji/1000px/flag.png
+++ b/priv/static/finmoji/1000px/flag.png
--- a/priv/static/finmoji/1000px/forest.png
+++ b/priv/static/finmoji/1000px/forest.png
--- a/priv/static/finmoji/1000px/four_seasons_of_bbq.png
+++ b/priv/static/finmoji/1000px/four_seasons_of_bbq.png
--- a/priv/static/finmoji/1000px/girlpower.png
+++ b/priv/static/finmoji/1000px/girlpower.png
--- a/priv/static/finmoji/1000px/handshake.png
+++ b/priv/static/finmoji/1000px/handshake.png
--- a/priv/static/finmoji/1000px/happiness.png
+++ b/priv/static/finmoji/1000px/happiness.png
--- a/priv/static/finmoji/1000px/headbanger.png
+++ b/priv/static/finmoji/1000px/headbanger.png
--- a/priv/static/finmoji/1000px/icebreaker.png
+++ b/priv/static/finmoji/1000px/icebreaker.png
--- a/priv/static/finmoji/1000px/iceman.png
+++ b/priv/static/finmoji/1000px/iceman.png
--- a/priv/static/finmoji/1000px/joulutorttu.png
+++ b/priv/static/finmoji/1000px/joulutorttu.png
--- a/priv/static/finmoji/1000px/kaamos.png
+++ b/priv/static/finmoji/1000px/kaamos.png
--- a/priv/static/finmoji/1000px/kalsarikannit_f.png
+++ b/priv/static/finmoji/1000px/kalsarikannit_f.png
--- a/priv/static/finmoji/1000px/kalsarikannit_m.png
+++ b/priv/static/finmoji/1000px/kalsarikannit_m.png
--- a/priv/static/finmoji/1000px/karjalanpiirakka.png
+++ b/priv/static/finmoji/1000px/karjalanpiirakka.png
--- a/priv/static/finmoji/1000px/kicksled.png
+++ b/priv/static/finmoji/1000px/kicksled.png
--- a/priv/static/finmoji/1000px/kokko.png
+++ b/priv/static/finmoji/1000px/kokko.png
--- a/priv/static/finmoji/1000px/lavatanssit.png
+++ b/priv/static/finmoji/1000px/lavatanssit.png
--- a/priv/static/finmoji/1000px/losthopes_f.png
+++ b/priv/static/finmoji/1000px/losthopes_f.png
--- a/priv/static/finmoji/1000px/losthopes_m.png
+++ b/priv/static/finmoji/1000px/losthopes_m.png
--- a/priv/static/finmoji/1000px/mattinykanen.png
+++ b/priv/static/finmoji/1000px/mattinykanen.png
--- a/priv/static/finmoji/1000px/meanwhileinfinland.png
+++ b/priv/static/finmoji/1000px/meanwhileinfinland.png
--- a/priv/static/finmoji/1000px/moominmamma.png
+++ b/priv/static/finmoji/1000px/moominmamma.png
--- a/priv/static/finmoji/1000px/nordicfamily.png
+++ b/priv/static/finmoji/1000px/nordicfamily.png
--- a/priv/static/finmoji/1000px/out_of_office.png
+++ b/priv/static/finmoji/1000px/out_of_office.png
--- a/priv/static/finmoji/1000px/peacemaker.png
+++ b/priv/static/finmoji/1000px/peacemaker.png
--- a/priv/static/finmoji/1000px/perkele.png
+++ b/priv/static/finmoji/1000px/perkele.png
--- a/priv/static/finmoji/1000px/pesapallo.png
+++ b/priv/static/finmoji/1000px/pesapallo.png
--- a/priv/static/finmoji/1000px/polarbear.png
+++ b/priv/static/finmoji/1000px/polarbear.png
--- a/priv/static/finmoji/1000px/pusa_hispida_saimensis.png
+++ b/priv/static/finmoji/1000px/pusa_hispida_saimensis.png
--- a/priv/static/finmoji/1000px/reindeer.png
+++ b/priv/static/finmoji/1000px/reindeer.png
--- a/priv/static/finmoji/1000px/sami.png
+++ b/priv/static/finmoji/1000px/sami.png
--- a/priv/static/finmoji/1000px/sauna_f.png
+++ b/priv/static/finmoji/1000px/sauna_f.png
--- a/priv/static/finmoji/1000px/sauna_m.png
+++ b/priv/static/finmoji/1000px/sauna_m.png
--- a/priv/static/finmoji/1000px/sauna_whisk.png
+++ b/priv/static/finmoji/1000px/sauna_whisk.png
--- a/priv/static/finmoji/1000px/sisu.png
+++ b/priv/static/finmoji/1000px/sisu.png
--- a/priv/static/finmoji/1000px/stuck.png
+++ b/priv/static/finmoji/1000px/stuck.png
--- a/priv/static/finmoji/1000px/suomimainittu.png
+++ b/priv/static/finmoji/1000px/suomimainittu.png
--- a/priv/static/finmoji/1000px/superfood.png
+++ b/priv/static/finmoji/1000px/superfood.png
--- a/priv/static/finmoji/1000px/swan.png
+++ b/priv/static/finmoji/1000px/swan.png
--- a/priv/static/finmoji/1000px/the_cap.png
+++ b/priv/static/finmoji/1000px/the_cap.png
--- a/priv/static/finmoji/1000px/the_conductor.png
+++ b/priv/static/finmoji/1000px/the_conductor.png
--- a/priv/static/finmoji/1000px/the_king.png
+++ b/priv/static/finmoji/1000px/the_king.png
--- a/priv/static/finmoji/1000px/the_voice.png
+++ b/priv/static/finmoji/1000px/the_voice.png
--- a/priv/static/finmoji/1000px/theoriginalsanta.png
+++ b/priv/static/finmoji/1000px/theoriginalsanta.png
--- a/priv/static/finmoji/1000px/tomoffinland.png
+++ b/priv/static/finmoji/1000px/tomoffinland.png
--- a/priv/static/finmoji/1000px/torillatavataan.png
+++ b/priv/static/finmoji/1000px/torillatavataan.png
--- a/priv/static/finmoji/1000px/unbreakable.png
+++ b/priv/static/finmoji/1000px/unbreakable.png
--- a/priv/static/finmoji/1000px/waiting.png
+++ b/priv/static/finmoji/1000px/waiting.png
--- a/priv/static/finmoji/1000px/white_nights.png
+++ b/priv/static/finmoji/1000px/white_nights.png
--- a/priv/static/finmoji/1000px/woollysocks.png
+++ b/priv/static/finmoji/1000px/woollysocks.png
--- a/priv/static/finmoji/128px/a_trusted_friend-128.png
+++ b/priv/static/finmoji/128px/a_trusted_friend-128.png
--- a/priv/static/finmoji/128px/alandislands-128.png
+++ b/priv/static/finmoji/128px/alandislands-128.png
--- a/priv/static/finmoji/128px/association-128.png
+++ b/priv/static/finmoji/128px/association-128.png
--- a/priv/static/finmoji/128px/auroraborealis-128.png
+++ b/priv/static/finmoji/128px/auroraborealis-128.png
--- a/priv/static/finmoji/128px/baby_in_a_box-128.png
+++ b/priv/static/finmoji/128px/baby_in_a_box-128.png
--- a/priv/static/finmoji/128px/bear-128.png
+++ b/priv/static/finmoji/128px/bear-128.png
--- a/priv/static/finmoji/128px/black_gold-128.png
+++ b/priv/static/finmoji/128px/black_gold-128.png
--- a/priv/static/finmoji/128px/christmasparty-128.png
+++ b/priv/static/finmoji/128px/christmasparty-128.png
--- a/priv/static/finmoji/128px/crosscountryskiing-128.png
+++ b/priv/static/finmoji/128px/crosscountryskiing-128.png
--- a/priv/static/finmoji/128px/cupofcoffee-128.png
+++ b/priv/static/finmoji/128px/cupofcoffee-128.png
--- a/priv/static/finmoji/128px/education-128.png
+++ b/priv/static/finmoji/128px/education-128.png
--- a/priv/static/finmoji/128px/fashionista_finns-128.png
+++ b/priv/static/finmoji/128px/fashionista_finns-128.png
--- a/priv/static/finmoji/128px/finnishlove-128.png
+++ b/priv/static/finmoji/128px/finnishlove-128.png
--- a/priv/static/finmoji/128px/flag-128.png
+++ b/priv/static/finmoji/128px/flag-128.png
--- a/priv/static/finmoji/128px/forest-128.png
+++ b/priv/static/finmoji/128px/forest-128.png
--- a/priv/static/finmoji/128px/four_seasons_of_bbq-128.png
+++ b/priv/static/finmoji/128px/four_seasons_of_bbq-128.png
--- a/priv/static/finmoji/128px/girlpower-128.png
+++ b/priv/static/finmoji/128px/girlpower-128.png
--- a/priv/static/finmoji/128px/handshake-128.png
+++ b/priv/static/finmoji/128px/handshake-128.png
--- a/priv/static/finmoji/128px/happiness-128.png
+++ b/priv/static/finmoji/128px/happiness-128.png
--- a/priv/static/finmoji/128px/headbanger-128.png
+++ b/priv/static/finmoji/128px/headbanger-128.png
--- a/priv/static/finmoji/128px/icebreaker-128.png
+++ b/priv/static/finmoji/128px/icebreaker-128.png
--- a/priv/static/finmoji/128px/iceman-128.png
+++ b/priv/static/finmoji/128px/iceman-128.png
--- a/priv/static/finmoji/128px/joulutorttu-128.png
+++ b/priv/static/finmoji/128px/joulutorttu-128.png
--- a/priv/static/finmoji/128px/kaamos-128.png
+++ b/priv/static/finmoji/128px/kaamos-128.png
--- a/priv/static/finmoji/128px/kalsarikannit_f-128.png
+++ b/priv/static/finmoji/128px/kalsarikannit_f-128.png
--- a/priv/static/finmoji/128px/kalsarikannit_m-128.png
+++ b/priv/static/finmoji/128px/kalsarikannit_m-128.png
--- a/priv/static/finmoji/128px/karjalanpiirakka-128.png
+++ b/priv/static/finmoji/128px/karjalanpiirakka-128.png
--- a/priv/static/finmoji/128px/kicksled-128.png
+++ b/priv/static/finmoji/128px/kicksled-128.png
--- a/priv/static/finmoji/128px/kokko-128.png
+++ b/priv/static/finmoji/128px/kokko-128.png
--- a/priv/static/finmoji/128px/lavatanssit-128.png
+++ b/priv/static/finmoji/128px/lavatanssit-128.png
--- a/priv/static/finmoji/128px/losthopes_f-128.png
+++ b/priv/static/finmoji/128px/losthopes_f-128.png
--- a/priv/static/finmoji/128px/losthopes_m-128.png
+++ b/priv/static/finmoji/128px/losthopes_m-128.png
--- a/priv/static/finmoji/128px/mattinykanen-128.png
+++ b/priv/static/finmoji/128px/mattinykanen-128.png
--- a/priv/static/finmoji/128px/meanwhileinfinland-128.png
+++ b/priv/static/finmoji/128px/meanwhileinfinland-128.png
--- a/priv/static/finmoji/128px/moominmamma-128.png
+++ b/priv/static/finmoji/128px/moominmamma-128.png
--- a/priv/static/finmoji/128px/nordicfamily-128.png
+++ b/priv/static/finmoji/128px/nordicfamily-128.png
--- a/priv/static/finmoji/128px/out_of_office-128.png
+++ b/priv/static/finmoji/128px/out_of_office-128.png
--- a/Show more
+++ b/Show more