From 7cb81e1957c6efad39c286d192831176c6aae44e Mon Sep 17 00:00:00 2001 From: Marc Monnerat Date: Sat, 4 Jul 2020 07:50:51 +0000 Subject: [PATCH 1/4] slightly bigger qrcode --- tomcat/config.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tomcat/config.yaml b/tomcat/config.yaml index b66872a15..2f8274342 100644 --- a/tomcat/config.yaml +++ b/tomcat/config.yaml @@ -1,7 +1,6 @@ # allowed DPIs dpis: [150, 254] -# # the list of allowed hosts # hosts: @@ -1396,14 +1395,14 @@ layouts: # QRCode #--------------------------------------- - !columns - absoluteY: 35 - absoluteX: 368 - width: 25 + absoluteY: 42 + absoluteX: 361 + width: 32 items: - !image align: right - maxWidth: 25 - maxHeight: 25 + maxWidth: 32 + maxHeight: 32 url: "${qrcodeurl}" #------------------------------------- @@ -1422,7 +1421,7 @@ layouts: # backgroundColor: white - !columns absoluteY: 25 - absoluteX: 310 + absoluteX: 303 width: 60 nbColumns: 1 config: @@ -1457,7 +1456,7 @@ layouts: - !columns absoluteY: 25 absoluteX: 95 - width: 215 + width: 208 config: borderWidth: 0.0 items: From eefe059b184b221c6c10715a01d6e022269d6156 Mon Sep 17 00:00:00 2001 From: Marc Monnerat Date: Sat, 4 Jul 2020 07:51:46 +0000 Subject: [PATCH 2/4] more output formats --- tomcat/config.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tomcat/config.yaml b/tomcat/config.yaml index 2f8274342..43507a17d 100644 --- a/tomcat/config.yaml +++ b/tomcat/config.yaml @@ -1,6 +1,18 @@ # allowed DPIs dpis: [150, 254] +# output formats +formats: + - pdf + - png + - jpeg + + # output formats +formats: + - pdf + - png + - jpeg + # the list of allowed hosts # hosts: From 4c43f89c3cc40497120dcd877c5aa414100066c1 Mon Sep 17 00:00:00 2001 From: Marc Monnerat Date: Sat, 4 Jul 2020 07:52:17 +0000 Subject: [PATCH 3/4] regenerate the .war file --- tomcat/service-print-main.war | Bin 32393234 -> 32393270 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tomcat/service-print-main.war b/tomcat/service-print-main.war index 46c4b5d1cd4cc3986fbd87a15aaeb7c2be5ff169..be26c8112626083e5a5d819f8db61dd392b86003 100644 GIT binary patch delta 6259 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 delta 6142 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 Date: Fri, 10 Jul 2020 08:16:46 +0000 Subject: [PATCH 4/4] 256 dpi --- tomcat/config.yaml | 2 +- tomcat/service-print-main.war | Bin 32393270 -> 32393272 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat/config.yaml b/tomcat/config.yaml index 43507a17d..cd34ada04 100644 --- a/tomcat/config.yaml +++ b/tomcat/config.yaml @@ -1,5 +1,5 @@ # allowed DPIs -dpis: [150, 254] +dpis: [150, 256] # output formats formats: diff --git a/tomcat/service-print-main.war b/tomcat/service-print-main.war index be26c8112626083e5a5d819f8db61dd392b86003..a4e65c0ce56ac628829adfbfa12ca060789875a9 100644 GIT binary patch delta 6075 zcmZ9QcQ}{f+s40F_Dad#D=Lbt%!H80D5GQ~p(T=%`9+rzH$ursU!qcqhC+5*grZ1R z6lGJg!mECN{NDF{j^n=W&vQQaabD;B{CPdTP|8`dyh0Ih1=1lsG9V)|Av3ZdE3zRw za^Onj#8tQ&xo{0~BM$k7>c6=N}?1><64wKSzL$faRbVsJZ{8I zsDO&N8I@2ORZtbxa0{xV25O=fYNHNrMP1y6dZ>>ExE&4A2#s+En&3_}MKj!m=4gSI zXob6R4_c!Q+M*rq#eHax`_Ta%(FvXL0J`8obj3sHhVJNrhw%s=#bbCJJ@Ev3p*NmH zA3TM=cpA^3AD%^j48TAP!e9(RDu!YhhT}OzjKD~Y!e~5?F&K*k<1ii*@B$`c5+>tC zyo4!u8B;M0(=h|DU?yHg8fIZOUc(&B#p`$jZ(<(a!rPdScknJ2U?JYa`}hDKVi7*V z$5@OdSc*@u49l?sE3pczu?C;wGklIO@Fl*&*I0{hunz0-EjC~yHsL#bkImSEAMhi# zVjF(KcKnPT*oj@(jXn4Ud$A9{;y3Ka0sM|Xa1e)Z7)Njv$8a1ca1wvwFPy^PIE^zn zi*q=Se{ca8aVZ)I09gTq4hTIE1|W<;n1C(E+j*h%S(AK=gp<12F)y z9f%oQW#16<_Ap3yW1KAJ6 z0f-|ICm_y14ghfhauA3skV8P+fVczk0CE_}5g133xA2goTP zzCca`IRnHG$XOu%KmvdS0to^V3?u{y6-X$MFd*ST&H+In5kMk=L;;Bgavn$wkXRrD zNF0!OAPGP&07(Rr1SA>AMIe`eqyV`LBo#;+kaQp!K&}AE1acJ!4M-M{Y#`TwJ0l5X_HjsQEcYxdlQUIh7$UPwUfjj{65J(Y_M?f9}DF#vkq!h>#AZ0+x zfm8sg1X2a08b}S0r$C+oc@E?Ske5JS0eKCi7RVbQbwKKYyamz#q!CCHkas}d18D}* z0^|dbk3d?1v;p}9q#ej-ARRzDfph`s2GRrM3y@wQeL%hf`39sP$N-SxyPqt`CG^_oWG56d0XT_|p zba8kwPKWQ;OWXkWHhv!2Gta}LC`omvF5g<6G)#1*o*xLUuD@%0s?l2{N+7AM!7u1J zW!g#chEAhuLmFYzy6v5?KVGhFkLHcw6Q^qL^D%TrR|c*v$r1b$R}+3;EYG{dwZglB zU;8=6#JLB13EPA_S(Nsf4rj*=ZSfXy$O(2hC)K^ixa$JzncSF!ae>LB_3_lK{v03O zrsibVgL}>v>AkvRSDC%5@PO}5C&9F>D+GEPzzA+z0Xdd2OM>x2y=ltbPIH0kYC z8Ij4`>mqs6*P$|CTxHXz*Rhd#UjyhfFU$-iW%#s7$xgXn^L|~TiXToC4_*ol`C)(J z1Ki#$P%x4ptgxBBeLBnRfmopUZ>q*O-Kp0n1J8)YxyxClrUm^`-x}^#%gt2rS^SgE z!G~e>WgPDp47yGw@m!5+d(`gF6XY`e`drkQiyV8&6p7_DRtx>z&i`>+qD~(EZY{WA zpdaC_V8^Z*`gyeIr(I6-t%2&Uf^POe_};8@YJ5D{cjAlq9yte|uxj@cyX+288ONU6 z3;QWe`=r$9sW{82wm2#iU*K=Me2O*37;L-fZsjTb0V=4IQyP z!E)@O3!kd zmJ7)B+S8|fN{IGeYU!%gdd}_)>-SWzO(HT|t;1)^B=}@fWhDxk&*+iCR6GAJ<$i(i zgp<_55UT_>-wzx3cry7!zi+tLlakhH7%Ly}?zWSY(?|LKk9ius=5P7Aet8J^y_U1w z-6GRkDemn3s_&&`5?iZ;<)<@^U-U#h^p&E@y;pb$ysW!oFi8$(kA+4xr1hD|QXj<+(q}RK~2|+SpTE?Yto2?KgYL zELeQre;bGEWWI6UQvCS(ZKC&OXpTIb-d>Yw{-GQt&t}dmnrO>xDgj#e+?BJ6PD;I^ zX+iXqiu*&iK7BEg{2dmcbmx-gLK3y+>qCuM_6D{5cx%SaM|FJJV6G;>HXWX^s`gi* zwc^xTWr6xI?TK$qJa0a|YGd`vbo6PY^BiHf7EwL&gNseuHN2Ol9mUl{#B%E@B|~+8 zYIhY2?7Xw~``Onp_4S}IV>@%uSN@s7p7ZZyYBK(?u8D5iqtBQu-SYg%tm55cG?(6C z;ALx)y2n<_@KAX0LLx1ES<$3M*8DVhx?0D4uefw;`Qs}SW$fWCJo|3Yzu}_&Vio%( z|Dd^e;PS=IF4>%tsij8ms+HlMtWJ@hDBIoUQZ2z61r?J6gKg2;bZ%0&ng`63tYU{P zX)&i>*3f_9O0T5U?6jeGDZLUT$eK~J(&d3sWp#yzsoUG~T3P?N6!U#mRn*OEcy;di z-iu(~tLG)p->!G>M9sZOGv@vl+e3qD;iGF<`c^XfyaA`w7{eMTi@So~yVqhjB7=FY<`zQ+x>PPr(VU71TZ4d_rghV*!eZ~r z0}I?XpC8>nY{Y6UX{LT6uH5ng`&G77PsN|CE8H5uVr9Q5?%5eqWALIznx|%?s(7+v z&w*;w19|Jh+bIF6bxR~La@Q<#{rH=lCfhAH|Ex65Zv3(BcHH!?rS~H3HJd{Dll+6# zuKbByEspwJRkNXPTTex(W~~yU?xtql4vBS+AbD(Dk(~fv_ z&#^-!*-CY^TD4wxGCMjkZ7;`geBJe^35mlDV!r|oYBo^Z_ef@*ff$CRsGlnShC5OMNp;;Z>ueeS-2bYZp5gKte!cO_izxfVw2>Am2jN~n)2 zw<#xGeYUjaiczTFnwdSf88N9c>!r9yl5=91+S%A721T+wse4z1nVsJHZ5-;UdL zw#h0cAUZ%Bg(k8%&+CRrcN)tGhOoCduCnt}dA!dzF3x`^`%&raP2tay70((UiSAeS zdvVEhMo{hZ&@I!F9-qRgTxnZgHC5^@fgdpmgVE1!Ohn$e5hdf)E7?=K+B(J7Vg2do zYacD_&xWsvsbSIPjp=^i!=#@^*A|tPHPIAb88*t!_h+*~?@2aM?W~7~U1{QSt|w}C zv#zt-Wq362-RkWvqOoRsr7brk?K_auvOsrTp>0Yvj#biA?`_F*yEjeMN?c-|{FT(C zH6LtC?NqdyG56Pdb%s7xi;kAr1izX>2FD7CeM3Ji+b;wSCl=O}oqI$d>f%+AOSmOZqd>zVPRNY@RU78-wdY8l;(GQX z?fnmzW0Y3{cXZD3DYA~Ica)~*Sm-RayYp&mS@PSge48b=H_OV6^=VLJ=}+~W!rB9U z$(m`WGlgE&Dr96XHfJ3xxu0viu}^@vHn=bKYe(6az_P8}`<^m1D&Fzcz{GE3qUWgD zzc(zraMo_;%)jdPGt#6#j_R3wC};EDfh#|%Elk$a*XZooerM}Op~*|UpI^JmPPWA`b=TomWff%97pYiFzY;~2zT zsPy%${T2mwaoeWE?{cl!>5`IJbuCb7P1QhW%ddQNl)acMdN#+^XYZ5{EpKr**Vrvv zrt!RGw2#atr2K?a;)923#4DIijnG7_>nSl*52jXex)xitBlP*1Lh&b=I1VMS=Z(0H zMAtI56kl&&cmuUh!c2_ZVlL(fL~3MqSxZz;USwr1NgT>7Wg8l+s4m|CbpOtFE z%a#KV@0$8&sZ|{8tvj2eUGPTYm9m*$sl0`RT|$JFO7mMf`R3sX;cI6jEh|N~Pn?PQ zAw*sMqAb%>CZ^cJeIWaMZ$3q2VbP(5T7Q(Xi`!Yjs(jzJFwa(1t00N(84MH0M~h2e zO~tK#;bGRfczN(uUva~XB+%8XAg@yWR$4tH& zRs7P9nPle^Y3FGCp-*;h9{=LAe#O?JZuX@RQ|1}jxGO$~tc#L_W#3lO7CW{qF7P&u z2u+3a-Pzyi5Z-v==kkm8oW!-n_WCk|l2$UO$`zw})9KV;t4{FSTiuf8!ATUSOV(A) z`62%H3nrqpqE2(cdu4k0jU5)_Qq2l1dDQskJ9AH2v-z5jkMR#xKC&f1DZZ? zJuY_ld;44ZxR=W0`I*j9-Zc}aU;b9*nkbVsTrWK|RX(#rd16b(gNnp>XH}jmmE2ox zr@Q=0SMfDkt;_H0?dD7hzS+Y-Gq-y<>}6j+V&Y%*{c4lO*y)D(k*rTcSEe-wDjNK& zsK-?1cg>vE{IMX?^Jyq|dKp$u3_p6%WHL6!(pYKp&8D<$Rn*aI3k9o3PJf&isSl{y z{IsGWfLh2rtvOU7)8VyE&G+N{=Vg8Eoq2Ph&F1=FYwkMMzL3&18vCF_cT{wM`A7W2 z|8T#z)|pV>!iOD9y6MS<8nfxi)a9z#xUjOnw6UYA^~mUcw%pPv5WcyeQIXfZB%#0j zlEA3NZUtMT=W~pc0mYa174GRMOx)MKBdW`U^|6a{2fIC&JdexeTf5!))3 zLUWJ8D!M!WQM)B5Eo3%0(t-_l%N8ndD^KP=w44m!*Vk%R+xEo%_guqpB0HQ4vEq3w3M*hLGy#>Hr~Jfb8ot?+q#eM^65G=rUzq~r)BqLigr>(b5iYGb_LDb zxW=ECC}ZGGvDH%e_Ulh!)km{pFL%26jIQ7kIp6udYgJT*kF~S&2X9raDLME!SS~R4 z!uBnJUM!D;l@=A`S|*yOJ>GR##QK{1+gA)*H0OR;6Y*)BN~_1E+ChQwX{nh#=3hf* zv`(shxKgSiv}o*?!oC#S)pz*A&&tkCCmrm1@zA22#%DiU#rzk255v#2UrLv{%hM&f zzABnw!`#VuN9u8r#;B^EZxN#Y4a00QrFvq)&Be3(t7fXDVq23GQmrZK3{#rtB@Fk= za!$Ed^sevKkF{RZ-cY9fEv0x)@u3tx*>~hk(NQ+Rh+pe>@=qAe@73d zSk_E)Un>?k$hBSIxXe=Ngf_8e8i;Jp-@ih3&Zr`(>EhOPYxn;)8+t4)!zhJOmkh7B zynFXxz@ZG^bS;6UDIGm4g+gJbEDuwvOvi@d3o0I1UHmUlt1ziGA`9Nz6INTHlv zUVQ(JvP?T^^v0wA`3tm-%OnKDG?V3B^k1u^e-)je<;#2f9690ZeB8^!Ym@g0kN?-v t(r~7W;|?8#a+8@t5&A#=KWI;vJvRJv8~f+qKx5l63TqiB%0_@f`5zR7BX|G+ delta 6004 zcmZ9Qc{J8t)c3D#CXytXqD*B@r81Q%(WE4mSx6B=lIb$+GIR`~Lbyz!GE+p7A#P=; zZbHc%p$Hku(ChA9>wTZ~oV9-Y`&r+!_x|m3{yb$-&p4m1e*OqZhxEvRjL3w{$bziM zhHH==IdCm<;yUEQ^~jAIkOwy+FK$9Uc6=O5!%$j#4O% zGAN63D31!b0~K*6?!w)ugnMu=?n7l%K~+>kb=;2!Py;nl3$;-P527v}LOs;S!*~Rb z;xRmq26zHbq9L9_BRq}9cm~hnIW$32G(&T=KufejYdnuOXp44u0qyZ3UP1?S#LMV} z&ggzL)i+AuY-orSI#{|5OiI{}RNW&CN#WYOE419o@n1$K+5Fg=V%)wmD!+b2jLM*~! zEWs!E6icxTpJ6#x;B&0R7g&Wau^MZz7VGd8)?)+ygN^ta-(V9qV+*$8TYQJ_@n3Ai zcKm=H*oj^E5kFx!e#Rc`#XjuE0UX33{DQ+cf?shI$8a3K;dh+CN&JCRIE^#-6K8P_ z=Wzjl;cr~TC0xc8{1XBMfY1S<2f_e^5eO3yW*{s;Sb?wsSp$R}2nUe0KsbS{1HuJl zJrHgn8-VZt*$9Le$R;3sK=^?O01*Tt1Y|Q1VIU$vwgA}*L==b^5OE+9KqP@|1F{{6 z6cA}3GC*X3$N`ZDq5xzE5Jez6f$RdZ8;BB+JwWyX*#|@!hzbx@AZkF=f$Rrz0Eh+< zO(0r8w1MaVIS51-$RQwlK=gqe266<*Q6R^F90y_mvO1;iT2c_21GY=PJTxd6l-$VDKRfH(kg1acXO6A))0EVUigQV*m7$Ui_DfxHIt21pZ-W*{vtrKze}m0_g+N4`cwyAdn#-Uw{k)83FPY$S9C8 zAmi}-8$AEaYI|VFKxcZp(0SUc&)-0j+Iq~lZ^bIs*#`e|LxsbK6jvL{}$>rd9&+cw*8`-BZDF!JBpx_x@E_0Iw7@8aXxmn#hI zqA%o|dwLI}x9@c8!7RT+2}yHRb8~Z{<8MOc8{hJrm#VD%ag7=orE6ooHmEn^fnU|B zcm)Seb=miqX#a4DD$R>s37#rAn8(~aKi@W)@{8u!kut}6r=BH`b;t75LfY|+A6@1K z0mt(uruArT4r8?P&4!cT9x-_JMAE)!l(GwN^r46(B+*{>e1i?t=j8%D>=TTofm@B} zEKQ!Oq|8Z6S!y?}L{|&CZ2COcgP|k-FS~P3yS2Iq1@lE$v|RIPqRjg#WU969Ziypn zDjvB+nnXx<8Y-vKJGnI$@-lvod*Ll!md?KvUL9B{ob6I}zS89wpK2Y3h1>Z$uQv)b zKVCL?_*-hw_#Ss5s%g5fX^?0yw{A}en@2`izas^;dIyiZ~u)^D%`I6F@^hs zeDB*#UIk@w`S2sc0qia#JWpz*HBovy-KMQv8;+&aY_GEM{VF0;J|>ZU#%imi`^gtx zKX%D=b>6y}J>0SC8>?DNuM?_kkReYr}sdUJL*6Fxy#wp1CPt<&( z&5e;Q9=XTN87(?}r~CT7JK40H)CLD?Z*!znDjnQyV8bbuy8J|XD8yh(_h^^~vx~~- zV=I^3D`o{dRc6Pn9OvgA z>t_Fn_#y4DYTc|}A+@=$=iAO1ihxV-6t`8h=aED=diAQ=eN&dtZJN}mii<21FYXS* z;@WWSZ}hV^XQWeqi`RBtaGT>xynI^dA$z&QJ$X&~L`OxgiG6#vMDv+uTaF#JQ;eg( zKJezYbZl{CAy1ETl4~pdzM(MpeClPd`We zt4$ru4p|E_ePr<&+O#m%7pgQRQGI`zjXUJ6p(ay|SXUte(-T;Zi$xMnvr1^QVbZ_n9=t!ek8T zY(tNG-Qe`v*fsiT=J4ydg15|EO{VGgeesme81;`LkvBe!HVH-c^CpNXTy;E>98h$- zjn73QK3m7b{=h4~LCZiF)}t2wmJg%?3yxf%9jvh{(2C2sE$=efb@J>^=Q%y|v!g!}v6Z zdzt_8X;FEt?*lGZBX%yb@AYIIXJ(4^N|x`_kKen~ksR$muWD;Q)6n{7R$O;Bv&nxn zeM>xx`XYP1u|iz&o@(w)tKVFiZ(6NNZ07b~ry8+N%22N7HFw7yaNF>8U-LkC_d`R` z<1N+ntZU!Mz5N)-J$&n*dbonNmKP#yq<7DlAqfZ%a>N(SdZf%F0=*+Tgo9H=_349WVRpMmcp)pZ-u@ zEE9VZ^{7KcqPqZF5fVCg~gZD*NU8Jm>it}_NGj`&M5yK&ZR7vDdU zI$#+c)_0dbs(BFZXnn@C}<@V3k|xuig2*OVULq z$jXwkRO#?(b2qbKZDHy;uK4Q2)YAcZ`6cxARmHu`+g|I>GHh{?Rez+MSj!abdx>PS zf1n@QO=ZtNY9J!VQb^B8aS10Gi9aJF-kK?$A0?H;vbPGWY|BQ}_{-PySs8qyo2LkQ zgp5!qnxgacKUw!OvS-v9zPqhBBV0HvAnZ|ZN3DEV&Q&v4CdaMa<)6GGV(rL- zz8Rm8yso2kuCYE%<9lB8N$BdB3p5s1+K#N1-}m*FrE6bx=ay*RzRg{(L%%+|?MC#PdKLzQTV12qFEB`Q^@PL+GdQwp`-&8; zr;VggZBnJf3VptA(^1n_+guaw`8K$YrW!pV%FVH#X-qEUu}X5MOnH61syNf`XanBr ze!Wf4(|2jlJiGGh&fx`qrBCD1_gt#Kn2+n}<;XZ*qMqFOo=3QyEBNRj$I+vlN1xZ} zyo?demdPzUIkrwGmsawFfpJ3+x2Md8D%&q>QIWZTQ$u4gRmhkAGoReT`I~iv8&y3I zTzFTnu5ntTJMh5>WHiLB0kZiS$@dbxcPKg!2Jos>tS>K}I&0&5X?T>*8S3>h+ zQv+e8tLI5BdpILJnP|aQ?xj`q;osDfEx$S?ErPBw zJFrq}Uk9$qHhq_&cjB0ovOxAjHU8A#xf^1f!2??2-x@i!>vVPwr16EePc+z%r#f8h z6k$l=GF|gAE4RME{#`*iM@O*O?!dnFa&#(OJ(*es@>e*iGG|H-?8`pkX6lyAzbB3* zqL9_Nu!LV?T=M3voezwIb3rhxV6M;X<+hg&uFh?O^kY*UO2vI$0X5mK_Dp8gbm7v5 z>zw8iD^#tTnB+wIZ4biXlwntnjzoI0}{a%^3CQE6VWMP26H=#b{q5j`nrV-|Z;SayZS znQpMm|KZ!q!wNk7&0@AG?>C+W&E_hL=E-ppQ=%ByutcjmfTXH^Y2>EC}1ie@!6o*t=<>RhnO zTQP3h@Zt*7l|P%tR3>8M?7k0Wc)sUbw@IbdOejTj;D!cn#Uh7rg2W3A+|j^WVPx?fOg@t*lc*pPS-$N9U?(Pu)( zuRm-~bj>(6=Nj^`vVm_#SayVd_&{4@poSNxQwi0>Ue*hM_Pt34LCvLdUjjb<3=EYY44*EO3KnctVEj^~dc#z0D+%Vx}Es5<1y?y;ZvzSWe1E;4Lh`_ zZmhe!v99=8@9@)c0nxD5`0{1>_TzdT6Q@}RJFKf%9P*4sW*hcB$}*}tJG&w0-M|s@ zyt3#g+we=n%d#E%^^=a4gR%S9H%hr5t(SL;C}L{!h$U4Uf0a|^ZI*WXm&VvE&Guz9 zF5IwLlHFk?z7+9AXHflz1F!g?d}N-)ptGRs(RvH{rxkfJ8^s6n51qAFT&a1g{!8C; zPu9{}-P8n9_^%ky$ zV3nqLs@{Ui!5WJvRCuUeLtA!zBe+yYX)_87;JkO3>qqLc-NL+y=F9y~L$RXiX?KS9 zUR+sjZ}lDQb%xI`PRM&!m$$zWU-+if`{G1vy6{&1ht1Db(7QR?LNxV^+t}_bzt8`6 zB>t8iXp>~^Gt!&ARWNoht6g|xN>3#z11bbcem5;M>{ncl_NR{RZGI%5v(9Trb4x_w zgvlCPC&`RE7x^h>vR2*>ejSd-YvvA$(n5O2FYn;8xZr3Z%2jpEG*+|7y!BS(E^cb^ z_D=$%3r2=hhqV&I%$$GA@eT|KYplvaJ#@fRj9FQ_|h9xs_s@Td|m zSxl3ekM#a7xaISe556bvE;dvOIyJ0~nz(v*u}{}+dbgy78}+|9@~pR7bv}M^Ub)%V zAz;_Mg1<+(E#!(eS}cB=pF5z?J^d-I{jO7hv@P0HRAcfTig{d z(`P)k&7W+Uyw6zFp~dWw)>T^G$P;Qmcabmqb!onO=Xw+6$Opd+Z(0jgD!;Ap%g+mO zp(eJEzFQvI5q6#DLtUxG?%}viMaBoLE?%8Jd8~J7wj*J5uG!I&`niJh+6|{(x!=@9 z>(7Z*@^^o$1W4O`DlO7w({nGLziatPa_~=)rqF(0>gMLV>&|G2JPVFZeo_axHxN zZohJ9${ieV1FFnWpXJAA`g63~Uq%g@v;Em{N6g@*8+C(*K9` zKfi$i!+%KQ`}GYZ{+gPrw4UQH8Z&(d8vkGXCGs7@H~q!Xec$1d_g|bV`3?j0fALe< zcSs}u|WMk_oXYYR5(cm!9u~GitRJ5u8a-fvPac}}u z;XO@%RptLy`>c`xKile5=k0CJJJ`DZ@6y8m5@08-c~$=oOB?&^9HKGlPW<0P(d1W2 z0LEyCS9SB>wvK-tFIvc|3JI@{X`r*v!;wQzp=7a8C<3e3_5arht!_0->TliD-?}Cm Q$Ds)jXPT_|4iw7&0cq_hz5oCK