Merge branch 'dev' of http://192.168.1.9:3000/Bug/GUI into dev
This commit is contained in:
@@ -1,24 +1,24 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
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
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
103
cfgs/client.key
103
cfgs/client.key
@@ -1,51 +1,52 @@
|
||||
-----BEGIN RSA PRIVATE KEY-----
|
||||
MIIJKQIBAAKCAgEA3XLrc43TbNgskS1HvCfRfYG8Hq0NQm8vQTfxUsJwgKxz/Z2O
|
||||
IVhjE6TbmfYfLaOWBRfecm80Yg4VNEux4DOkyRof0XSwDcAYQzYsAAm3+NbTLzHO
|
||||
1us0OzwT+Me0/iahsQh6X9b1waogmk2NEwiHSqK3MDbOcOcs12+ff1prqI8hpkyo
|
||||
NlFQxI/rCQLwM6WjoeviRJ3D0xXOZDT9WHDSKyGuIewVj62uLcHZO3wDuDymQvpK
|
||||
KriVtQWWDKqzZXZP0Sc04gbA/irOr/+wLFXsCTwkCf6gITjVWUKNr7h13zc3V3en
|
||||
z8dVqaj8O13lfrCjnhwQvNzolLkKQ3P2Mxw+jTFPiA5tkB4mJoqgcbZYGvF0PfmO
|
||||
Sxn7hnl9IymPP11XPecOeFS8jfpPSFSy2Fn56LANpOkyAiEZcf2pKsPQedyhGhiv
|
||||
COX6SyivO031BZA5UnA3yOf3RfWRso04+QDzhBje4uC/Uc8q3bFHqH3C7axSD06E
|
||||
bWh83ohcjoYJzTpDyDjVeXgbwy6g7HCWcplloSMsaQX7QAoWSSuaK/n+0n5tJ5tr
|
||||
DqvAC/guc+gNPX3g+Q+HTwGrSrtOSxoRyMwufNZpzSel0lJmWv6LoAn7HPt5wxL/
|
||||
TG4o9AMPQbVseWqGto6Z5K4XMC/C5/2ixLj0/PsEazBpd2sezJDSgPop+v0CAwEA
|
||||
AQKCAgEAyQXdPtRsLM5ABrm3+NGclfYDM0WcV8ZeezGxW5MuVWA3Gu6/av21UsvA
|
||||
nY6S1vc84/q6796LCsgF76cXHZND71pLr/PhLVpHrBus7Yvk+Xrp0lnAjdCNZYgw
|
||||
CRIg9uVSukYb8IxOIzOwzOHBQpnnVpVG/fmChXMVfavSeeU2/ZiQz0mfGU/Ppd+P
|
||||
WGrWacvfMsnSaL9eWGvfI5AGuxYPcx/r1tdc60SabOcfr6PwLHrB4uMaGJXfMKiV
|
||||
gYIjv+MaqZ6RnuzKnO93GMVew6Br2CZEAN6ntgDFi3Wi8PTd63dQQZJZP4CP/qdr
|
||||
8OhXwB3RKWIIv6k5aGhhLMJDqDnnfMuezi0maTSwZ2qr9NAofWzhaHBNvTQ2b+UE
|
||||
46flpiJJrARiw37BNN/hM4dAqF3zDOZWOGffRi1s6Ax4jEnjpO4QwrkTK+OGN7N4
|
||||
0a68QEQrrIOgc3Szk1LjyGJX7GefKmRSoB7XVf2gKdrm17g9EnYVyrp9KSxAgBw3
|
||||
CTmL5tDYlAgQdFKoybRlnq4SUdjaX6Z328XwX278Jt8myQLS86IRuCA6ozRTshb9
|
||||
e5R8jg/Rgl0jLbZm7nZLrer+YyW1bDtkUUFiFecpccmGch/gI0OLtpgDiL2hZBjh
|
||||
tydKphVLa5JUKKIJ3CTmhoCtkiHXdaEVesxp20VazmzvEOqgUnECggEBAPlApVDk
|
||||
tjrtIL2Vs8ogbdHxUWZug2zzVLY+q4M6n5yPJHAhtijxy9Z8ZstzqDfwXuAC7Kf3
|
||||
Myfq19vJ6pteJfukp3F1zW7k1fa3yjqWu7NiBOrc55iTtjl1i2CtseWxRp9jNzD3
|
||||
rpQEtUxTbcm3ShmPwMnD2CFaoGObnDeMnC6qSQWPdO10IkL3aXARcZw1YXSOWf8i
|
||||
dLa2Mg33qmRAdeKTbF01zQNK1tSFZcxd8+rau2Ry16inDjgxGELFzsAFowOa+IyN
|
||||
ptDm5eczQHL5rrxolF141fTHLpBDbgE9WsIJyG3eIrXcfkFH0ccms14J56FTg/mZ
|
||||
3iI7GJCb/RWVxcMCggEBAONxl1DaW+EmfAUJXfr2gNjO0zsOXyvJILC4WHC1VO5X
|
||||
/DY6irTIUNffrB/EuTOHDlv/6m/pP1DQdgyYUKd5cQMYBMu5EIsGH/gl28tgs9rT
|
||||
0q3Vm8ReWJNfQAUBf3Y6ZlsvVO4KF1MVDQfZYkdPs87l5gDwsXc3zu5iJtGxvU5R
|
||||
RRalrr3bXhRoJJxN/k60l7yzA4Vos4GpSWEDopL9Ygsj2xPaiEjzczrmIX9/s4yo
|
||||
WuaYAh/eXYmYCuWQhkbIVSWUekj6FfNX7wLTuA016jqHBstx1s6S+V5SpsrYVDTH
|
||||
oNYwDJNwoRppnmaXzVWTWqUnbaKBjyH/aoFIRTuDcD8CggEANyl/bK+xRMlF/a8r
|
||||
4wfaRiRKB4ldvLb9gHfOLXTD7jofrlFHpzgcDJPrjAtEp1yjIqCDD4k94Q+wRgwh
|
||||
x9DGRzLhe9K+bFRopfl24BCL6d8/h1rsRnAqW/0Po43NWTAqmQu0IzotgMSp+wJb
|
||||
wdC2rYGLARw+sOMFrAW8RO7xgcJd9sUQ85xIGNn4k7zIj/GgZ9M5R6Wwft9DpKOz
|
||||
Kgy6CjLmQJqvjJL7iH0dUmVYnhlab5ia8dBG7ViwLdbpMsYMlbeuWizfRkxThR9q
|
||||
nAd2DGx4qVccwtdyDqtdpRiXBWp02RvYQrdRmdDzNEf0WlOG18VL5+mNp7W8cgST
|
||||
tjs3UQKCAQBiJtEACVuBLFR07/fop5wu9AJgB/G2OZOr78Hq0bYXLU0gMd9N6OxK
|
||||
XLIw+3pY7D2cIjKPnP6/51YqVUjpHRVSGnlnWTP0au487kmN2OuE0cinT/lqorRi
|
||||
1MYR4vWYldc6HpDuMNij9/+plXw9/f1AmiHJ4hUTt7fLU/wgni1tsNC510IzmIlf
|
||||
ERpLgbTvTiv1OOOaHPbqS53pCeKMwGAhIpYWWUZbBQSDNHDcTsWzO6wOuyafjhyb
|
||||
lkuNifMIdMeZ8htbhuEWJKp2c9uHh+7O1xptjXD/sJmAxPZJr1WXeVbFV/L1ZbOA
|
||||
bHf5GiV4eqCxiPRdHsAgEdNqez+1USGNAoIBAQCizud3lUBLQ9e5H6wmP496Su+W
|
||||
OpLJLk0pxNu8cB/qXrKbYy/PIJjt615zXwpI7IrrwhZh0Omq0qtEbYPMAWeE2AP2
|
||||
BuTlZn9Hh0LuXKPuvQstp8z8lI5nihFXqxTaLv82Iurj3dRNMC9IXHguagjywYp5
|
||||
CRUlGC/SrwadAlnvVmTD3bpotalMJr0GtMZiOsIUp2zsTO2AvsdGJe8xVWTXARjc
|
||||
6X2cwxY6QHBiSHcR4vf52RuZJSDE9Nypzjtb3j1vBj6kAhlLA0Q30kCU1U9tJp6b
|
||||
TJTZUebUsvhWDP4d9pTJmgSnyoZzEkyeVRm5/F7LnU4rvb+5dQpiyM9vfzlE
|
||||
-----END RSA PRIVATE KEY-----
|
||||
-----BEGIN PRIVATE KEY-----
|
||||
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
|
||||
et3Jk7+qlSGWaVweJn9x4BUti/ZtzQ==
|
||||
-----END PRIVATE KEY-----
|
||||
|
||||
Reference in New Issue
Block a user