From a68714b1c3cedf1daab978092db140194def1480 Mon Sep 17 00:00:00 2001 From: Elbert Alias <77259+AliasIO@users.noreply.github.com> Date: Sun, 1 Nov 2020 08:56:44 +1100 Subject: [PATCH] Fix merge --- src/icons/Sotel.png | Bin 8873 -> 0 bytes src/technologies.json | 12 +++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) delete mode 100644 src/icons/Sotel.png diff --git a/src/icons/Sotel.png b/src/icons/Sotel.png deleted file mode 100644 index 5f3cf56369e45828088d21039f7245ec904697e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8873 zcmV;aB39jrP)004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U( zX+uL$P-t&-Z*ypGa3D!TLm+T+Z)Rz1WdHz3$DNjUR8-d%htIutdZEoQ0#b(FyTAa_ zdy`&8VVD_UC<6{NG_fI~0ue<-nj%P0#DLLIBvwSR5EN9f2P6n6F&ITuEN@2Ei>|D^ z_ww@lRz|vC zuzLs)$;-`!o*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!&C1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2h zoGcOF60t^#FqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTX za!E_i;d2ub1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqK zG_|(0G&D0Z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY z_n(^h55xYX#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^b zXThc7C4-yrInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qj zZ=)yBuQ3=54Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK% z>{;v(b^`kbN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<) z0>40zCTJ7v2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01) zS~6}jY?%U?gEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j z*2tcg9i<^OEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfKTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761 zjmyXF)a;mc^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQq zHZJR2&bcD49Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^ zTY0bZ?)4%01p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK z8LKk71XR(_RKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS z<&CX#T35dwS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@ zqL5!WvekBL-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW z%ue3U;av{94wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#oSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%o zZ=0JGnu?n~9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8N zo_-(u{qS+0<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-U zsyQuty7Ua;Ou?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimk zUAw*F_TX^n@STz9kDQ z$NC=!KfXWC8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgU zAAWQEt$#LRcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6 z?<+s(e(3(_^YOu_)K8!O1p}D#{JO;G(*OVf32;bRa{vGi!~g&e!~vBn4jTXf7urcg zK~#8N&07h474^0L?w*^Q-0TTSAPKu5ARq{c3fSU8T~TSDOWkVgqt>ogt?09sYW<Ge@`$YbyXTM>zAGZ&*G@i2@= zlj3``1K za~ANzYC6HG4`{gm{Y$Z+GqY^FpyCW!I*vvBK- zN04IA!iRgG#quu~BNz!_aOz0>@tQC6Uu%Z~!`n4buE^KF_YbBA3H|e_VcmPcky7BI zs{o5lAJlOEsB2N}E<=m24rPryvHs8s5 zm%I#zH5E3C9Zz3X4716q|C)wa+<-S~1Kb1C(>otK74$y>e*QhcO2Zc~`j^XEHrtl@zYs<#*AT?>t}SvPxiR5 z^neHPtB2?#r;h${Kw}-y+QeUxpD}1--QdUPJwrnD!Ddcm*xT{;?q~1;LtPLeQ7+r` zYcl*68lMec*p0D+X5x&&-%^ivhax-qBNWH-nt(oX>gb;XHm}vnpWDUQjOl}4#~|lW zTr}nfXz|yv)Fp95!6zjzsm#B=^zYoShr^ai7aB-_E?hq0$4IowdELXvax0vW`uCRu)kpL};^1!00qR)KnPf59Fl)s3RDBR-1#nnX;0d+h&7Du8_{h6z zWw02nj0Qgn(@sZz$_V|+?okt@vyBE+d7`W#+I@Y|I94(umK^e8OKab&MDGr0YXRPR z3Ha+H!1GJEe;BAN*N(L`YLOpeC`vk<0IBv&OfHy99pF)?oM?5TrmYm!u2OzZQP1&( z+?ZZ856KCc>i3@Tg)2g@8sUz|v8GWo_W7eee1B^Te!Zg=H*#Ox)HlJW|kdLTI!`0QWWSPyX8GcdjI5>*ql!$##Nn?#TNQjifaEOR2c zB0)Xg6E@Tb=>P*ftOR@95ghPF@z6mpoy&m)6Am^gwI}NC-Bo{E`h4FI>=m@ix|FT)=6iJoh zHTp%}!%hMeanr5}J3`c9wzG&N>Ci{I$N!Xi7&=@CI$mz=3M&|$WX8-)E|7-?M>t61 z$0VCE+`&2ag5DiaL2IVqqqZ zQDy!1y+lQN;vltDo(Qj%xEbc0HtpnP)D{M$aK#@R=fnj?iAdwIJI1Hr?$OEG1-+nm z2S{gk`kBB_e@8|0zreSz-~{a2v5Xw;ILQb$u0Vif_`+k_v2I{CSs0-vRJ0sW39yP= zMeBZUB{a^v1$riVFsm2_lSRz?tJe!IyBf7>EU zu8j=T}T=#Ug;x5_Ab5?s3@Z&SP3LeB9y0xz5+g_UigMEVO>4;)X~Yw9i9Ww zAR)x3rlsS~!k!zbP6*bplI5u%)f&?DX|?*L&&V1CJhcM2>1Px`l(v4Z4AbPBG+wZK zP7cNl;_8YLl(-JWFo9Jeyr7`(#tV+DKF%Ey0j{0(O4*-w%EyyO*?vX2V1%L^Ij9fx zjz~15gdzcTAC3mOQPe7wLUHYQZy2?@Ucu`}l{v*t`p8LO%Wo8=dAI&WQI2uI+NsMi z>+=OLS-UW8e-PtJxtMTL8RRbMnb_a370-QsHzltf!H6GLla)lRV8QqsQJHuptT1C- zvXP3=fFu()vl^sd!|i)q_{;c{NZWQi%ZhemEs0utetFCR`+vI`?vfTvef1(3d${RI zA;esL=QWb+KQ(ftfWp;3#F}wdY&`TX7R_CT7q{GxnZxE|bNTzoNk~9);a#}!<3<=0 z4alO7za-m+TXXH0$PzXn_=p5AO7lXQlP;3P0Rq>aMrFhKE0mpgu2X`IekC67V?1_% zzuKdOT7%k`C3h>zBfro-3mR$_W#N3qv+oO~G1{y&`)ZY!itkspSFToC{S8VW)U0@- ziZXOno$_XlUwOCIue@00Q}DE&S`C{y$x`j}$s*!cl+E`l%5x4yDSbm9)NpL6ontfL z7@3A(oey9AY6BYARwC3$a_a+phuc60;>dG*Q2pj1ZSaXlDX1RTJ_{rj2IV2ik%?4O z8V)t?L`$F!hnsg(-y|ZznvNGMyhvv$d$`PpTeh|0ru;-ad6~x6s3LKFJfD^4V-jzv zHr5yTNbtpXv5%%ax3Fv%T&y3^aO|!AaKNujC1p0DBrF%M*%wVD0RW^FQ`tKv*%rm`nGaxKJp%X zp;q-7V0Ka-jJCmey4(xek2{MTxIEvEwY5RqSdautd$!=`0bkrF6J^z58O}XNn?O(S zuurMoz-!pOHghg9rsS9(0(rA(%W;pI>IwWIyE|@aNnl%{qTnA#Is2UB5&5ohh4+S2)gT$Am5#Xd5s_{KTK_vzK z#+DFP)&x;R4tQdp51ZyBVtN7>qH-;X>RI4QO7t-Kr0YXd5-NfXHo%HbgN$!$*Nd(%MMjbqS5inWi5l#HcEE zs@@8cF7=3~9B82!lL!%(H`7T{fy613?qyqlyMEzus1EQ~xZ&E~086S38E5A)^j$do zr(Fm)1z|}~;7Qua+LJp24UQw~4rA=%vyn6`6*ceD<8+KA*#^(SRt&p+f_A|`!F2#Q z_$r$r%5QmKYRlk815-u=Ypw-YT4Cq7k=25&HETI9l2qk zEd+n17jdRgUyXP9!uZ#h)o5&EZuW*$8hX}Z?niNzx!RjaY7*L#%XUg}2Z=I)sV1x5 z{wgg_X)ea+pU-xZgj~mT_+k;e+=sdU4f`7QK7{GENjE&$xULfRK@KQ1%3tnA@|biu zPtSmJdzx&HIi77-0nDoIeECOgoZCrXqb>F868r(VijBd}G5A{O*n2czu02 z)_+xx5FIzJAO$A9Jemju1KJ=m%^rehQ=isGDKVi)ov|LL<3JN(jsj3!+@z<7VsNfH+3a444uv zeG*SAHy**|i`U_vm%db2zm`0+dS?w5y|P0ce|a@isW-?Y^HJZ|zX-lIJ4R;+NX!Su z{)iF6$Pfre$hAh=Dk;QDBrxV(HXOdvHkIHaZDBQxbLJKz;tJuwAGV@xPZO^(cUpb< zL?+O_^Z_4ktHMPOtj1k0(D3aw>XV(UR6COF7G$N^5#~MD?5e|}S9joB_kDuppB~n) z>7m3ZvXwr;V*PQGx5xnZel>qA=AT`tAMFOgX7a&3B*D!LZF#%YVNv4jLnK9#3V`!pp;PQ? z?#FA^!m_{xjw;U^j!FnGF)C`N$ii+1tQ2X9tSTk4wXuNPk)XxZU1xd6t+=FV7&UdD@rQcaLd!1P|@H+t2YE2jTYnk3UNdr6hjJAFgqmykKQ~P7f$Zx4RI52lP2Ux!SHB58zKw_?X$}tDD!(Zja?mO1P z%D!8|KHM5oS3GUnAf`qE?2Ha0c>?Uz%*=fQ_wA@>PA^!p9(#|vXha-Vvx!|F&+U*t zCj)VWY&MGtnNAyC{pCzd9oZq`qO2g*>sa3O+Ak%pWv_NWDVd@Jq=x(0{f)W-m`wI> zZ-R7ma)9ta>0{gAIp8Ae8_4t#$;_mTT#J%mE=bLB-#B8|SXShRxI0bNzMJ=9kx$ zA(gFilvSa)q!B?9R07Xc|77Jq1i7L@(>TQK5h$GbQopO-#4gggGc1(8-i#*WLu)KQsmaP`eBHJcAM;83+k zm9P>CeN6$~=bg~s^pVS@L#<&Y0{e{H=8wUH*G)oRdY5+uFSBpBn%v;f%Bto7PU!Hm zuQ2>a zM2r&>Zi(~v#b$Z)tG&_FAi}Eso479cjxO59js$HCv5#C?~g;@?Vak`okPU?Z} zhgz_=!i5N#THcn+Z(3Lir7BoVOcU+JE#>x{zQiNEzEIX$t_cG;UxWWT37628VDDNvo-S-#QYJK z%buUU`lu0Zc>FVbx~HBR-i!vSLQ#oRhG!r*-3|xKrf|ddGRjjfXF83XH#rZJd3+2z zy@ISH)j0u@ZInidfpTYw0I|tTXW2wJv6MD@LMW|n!=8#Ztl3eEgZ%90b*T%{bIJyCqkg{Sd(;&1bai1JB05pUW;j`Wnol7DxN1d z?B|L%w+1kpAvSNyV2sF3#%zXN770iuQd;^wm=1 zkfJM*PR-_Zc^Qc~ZEy<46{TS2Y1v3gvN4bCI9%(&XZz~$=B7$Ae;7v_yzny;t!&f^ znT}VmXSjdCc-1*4gFZW;p^Y;4!8JHQ=_Z*4k?Pj}VgOfJZx1ryXLJQbXT1A_SOZ`Uvavhjx>cK)9h?t5Vyo@FmT zd1MB1*u1>*NhxyJ%}J$Dt>hj0bQ2w_W7@Cd^d$Tx^rI9$W_G97%^HfAe$mTQ;Xa~! zM(GAp>$QAsU$^5}`d*0|mPOePHZ2KAU>7H3DMpKXPsVsbr|Wp%L`G0fsvY@5Qq&Id zWv1U+uKqxv?+)OZM&@d?n}D%1Pi>s!@p7jh7(mER$|hC7$uvkDpm&&kcEH-5wK!1c z#RuD}@Zr`f)!5_shOF)e?T#2I^vMCG6heRb=m6?j3HGuy{q>`RsBY=oYqNGp;)tF( zw&`P%QC-LXo#>MT@VQQOxRUSC6pRo8n_UE@J@wVPWT zKewSuKFb)RtGdxoO)r8dtO_7`?%1M(}uW*3pLEO_D{yE#hV#$qTKl8T8#(=cIhGDhSisbprQXp;HMETc3dGgF?-w2s zU65=wBAr{d&42=j38NAzxA_}wtoPdwHQ~MOb$F||g1R6Ki_;D}&;8_g7vQYXC;qeg zzM#(zI1#L~pM}Emx9Wj8n8HR$dV|%C5xjZWhg}t3>U|m=j>AoX<74WCq+jT8S2IJw z#>h&dSW2-NkRk6FD2b;PB;k@mJHC}|MRijEWwmZR{B{Xeu?((SdKoUD)b20(?SN1u ziqCe{VaA9wxD)L7`KEg8DRrZPLavEiq5cV*#Jb9Maz*>T3uG2D71^uZ6i;Kx%e0x0 z$!mudI`GKZIT)W}L>W81L`GFEWpjVgZwJWbLVEeHmZ4^!{E;MAPhRNDi+<_`g9wOr z^yN-;j+`bwl9#ZE@>Rt?&2y##b=Gif?C<)gLOUAi*@_(7I zuaN5p00ZWL?xCQ>6+v;0A0;gzlzSuGvy*d&;a2~omA7W@Co@_`rdUzLZCJ7eqtmRI rn3aGj*=%qI#?Bt`4LjifJAnTK57NI6y7f<&00000NkvXXu0mjf(W?7t diff --git a/src/technologies.json b/src/technologies.json index 6263a48e1..374c91070 100644 --- a/src/technologies.json +++ b/src/technologies.json @@ -3072,7 +3072,7 @@ }, "website": "https://www.coconutsoftware.com/" }, - + "CodeIgniter": { "cats": [ 18 @@ -15407,6 +15407,16 @@ "scripts": "^https?://(?:[^/]+\\.)?yieldlab\\.net/", "website": "http://yieldlab.de" }, + "Cloudinary": { + "cats": [ + 31 + ], + "html": [ + "]+\\.cloudinary\\.com\\;confidence:80" + ], + "icon": "Cloudinary.svg", + "website": "https://cloudinary.com" + }, "Yii": { "cats": [ 18