From aee606841222b41faba3c2d19c79ee43faf896ab Mon Sep 17 00:00:00 2001
From: Flaburgan <flaburgan@geexxx.fr>
Date: Sun, 2 Dec 2012 13:20:24 +0100
Subject: [PATCH 1/2] Resize deletelabel and ignoreuser images to align them

---
 app/assets/images/deletelabel.png      | Bin 135 -> 203 bytes
 app/assets/images/icons/ignoreuser.png | Bin 463 -> 455 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/assets/images/deletelabel.png b/app/assets/images/deletelabel.png
index 768ed6608849f02ddc5d63f07158982692d9569f..b3e53ee3a767e955a4e48b6e83edc8287d8d5ab2 100644
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xawj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwIhlyK9ydW*;8&D|1)5S4F<9u?0#3qL+jg5)=%*@SV
zlV<2KGauGlA>+4UdSl~5dmu-91zW7fZ~G8Fb%(GYT)k_(PwYG~t1v4`>C*dp&yBq*
q%O}ZNY<O|OwfJb9(?!D$Muyex3VFYaj}`&#VDNPHb6Mw<&;$UI-ah~U

literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqex5FlArezt&tK$hFyLu<$Y1_K
z$mu)#Lhe%bmHI2U1$~^?_eW)Cb4%0R#XZV1n%blk+Vc-CbFBSoGw)48)9n1YtKUBD
jzCU5_Gg*xq$6X8?I~4Mc`E7a)G?~HE)z4*}Q$iB}Rt_^D

diff --git a/app/assets/images/icons/ignoreuser.png b/app/assets/images/icons/ignoreuser.png
index c12f90842337edd0c8410e4ea4054d3a1532b541..b02d62923dd743a97f2cb4c32df73d970fa75acd 100644
GIT binary patch
delta 442
zcmV;r0Y(1L1IGh1iBL{Q4GJ0x0000DNk~Le0000E0000E2nGNE03S##(EtDd24YJ`
zL;(K){{a7>y{D6rF&KXbbV*G`2iyz-3n~n(Sv;Ho00C4<L_t(2&y|opOF{t@hM#l2
zewA~m;3kH5(7{ELpdcC>U7Y#>5kcj26WkO;aBzw!=*}(8E%gUlgF-`Vk;I`e%1%p{
zMEcMN-sR;y9L|wasnqTF`&YeQZ_9C<CqPAHq^bhAVXT`Ik!OFS)oL~Te*e1H>pgS_
zRn;60haSEWRrLUdTNuDmyWQT2L?Wp|q2P$fqKKRZgTZ?dITn!>5qTGp(N~@sC!f#n
z+qT`!<#LaJj^&amSS=QdAL(>@TzmtT{u52$#<p!uCX=ps1Nf)ex-B9P<#JgQiNpZd
zWlA;y$1se$N~M1CW?9w+F#ne@51a!d_de4!wOXxeEEanJmVXmZCcdeF`g}gE)oL0J
zhr7VSq?7_)e-Z%=1Oi&G*EJfAo=u7e!0lfNg+kp%qw#K8R-ReOX0vO}X7eQ;k8gNp
k5j&mE-C!`d&SWxspI!utSoNUs&j0`b07*qoM6N<$f=?v7djJ3c

literal 463
zcmeAS@N?(olHy`uVBq!ia0vp@K+MO%1|+}KPrC%9Sc;uILpXq-h9ji|$mcBZh%5%u
zn?aay=jARIAVadmHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpducSqL9pz
zoK%L)^t}9{RMz`n+ZY%aO*~y3Lo_D#UbOW-93XP+W4%{LBilh&r-jj(vv|sMr!_2E
zY++TRS;sUzY4eeV(cFp`7Vd85;CuDp&7<ua8myUfVwdQ@Dl}-kF#Sd2^P=hU-{%xx
zG+E1}p%gT6f3}L!inD2-tITHaWztRHGMMRep>(dOsjuGbdCz;LdXMpLV86p8SimpS
z!O{KGHsSR5zlD3_>X}uhF5jxr_WNzw@7+;rmtB;(an?!8;7e_M&TYR70yiSMlPZ>J
zcwKo}vLr@tKl9o%-;zqWVxAW5oSwJcx?JYD;EDCoE^-wN`zBR}gieiHuYNSikm*k7
zi=xDArjBKqLM)9lmRYiG3zpp|Tz^Z5$>n+}=ivaZ)<dyUu?*)U4SAC9y#H=5d)zWI
z$|Wpo>#c_g20t{WdL8%rbf^AQ>0Ra1o6glU@MhW@bM1R{1Q@Oip00i_>zopr0LhiP
AIsgCw


From 65c16ac44c3e040c3be4bc5f365a414c3b22c9a2 Mon Sep 17 00:00:00 2001
From: Flaburgan <flaburgan@geexxx.fr>
Date: Sun, 2 Dec 2012 13:26:46 +0100
Subject: [PATCH 2/2] Update changelog

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 240155584..95f4d1dfa 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -20,6 +20,7 @@
 * Renamed `server.db` to `server.database` to match the example configuration.
 * Fix insecure image of cat on user edit page - New photo courtesy of 
 [khanb1 on flickr](http://www.flickr.com/photos/albaraa/) under CC BY 2.0.
+* Resize deletelabel and ignoreuser images to align them [#3779](https://github.com/diaspora/diaspora/issues/3779)
 
 
 # 0.0.2.0