Skip to content

Commit b60e733

Browse files
committed
Merge branch '1.0.x' into 2.0.x
2 parents 81b05dc + d8eceb3 commit b60e733

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ env:
44
global:
55
- PUBLISH_JDK=oraclejdk8
66
# PGP_PASSPHRASE
7-
- secure: "bTGw0loJcnmzNuJG3bjGLs7tfnrWlLb3oi6nBeYUS+coRhKzK4jMN6luuh89gVwIcbFK2nZUkm1s59UZzQA0SMBsdL/Js9Zi6jiUj4NBIVEOzgQxp/vlScF/kF7HxxBji6Gxp/TpqW2MOFxCtWWGBoktuAsufFEhJ47m/cVUZBY="
7+
- secure: "MIHv2s6njtXubCzbP/eYXszuO/Y3FADYATZpDtOULZmQHcQ8z+sccQHidyq6hvoK9/I2hRUrc5RIelfA7D32tqP7aF3P9Dq1ZdiWqZYmFKUl6wzJMhgWwnT1RA9Nu67PcNLZGwOe7+55zZpWVNbeTKMe05TzUaaGUgApr9wvS0I="
88
# SONA_USER
9-
- secure: "uJEIIJGX+xviY5prNor9WW8JuV4MdQbNvGe6nO4Cwumv8LEXALlpONZrmF5BvEB7HrmB/VUqwDO9utrhN7VPaFhCTnoHuslbSdhdB9Yg/lwD+0FpszvKjjraoWeQqqJuXoml9kmH4kQBIP4RxPTnzocPHRIfVyEOYRnMtydImBA="
9+
- secure: "e3FEhT76+qpmeubxtthmubnuyf5faCZneB1lQE8zv89/NZrD+v6tM8hGWatfiyyswmcaUdukxW/Q3NVlesKiy+cJLgNJ8AImRckKPiPVUYpXcQoc0R1Nyl4DeDyorGE17SslW28frlRU9OutTnZQlOfg4uqCdZuuCdcPV0lnGAU="
1010
# SONA_PASS
11-
- secure: "SlbOg79Jzzg7QQeVDu8Q+zZM/GRLFZxPjud9DsLCu4tkTVXWHcYn6FaXuOvVsLkgeALT2pM5j6Zcpp6WqyGRJiSkVqVGqM3jXWov+esgSmhu9pIMvVtxmvfiHBXofiKNYax3XCX+hTwCVuh2pEZ5Thy8i+fXVElCCqzcgTnp+DQ="
11+
- secure: "BLhtiCjcjvwB0lUvfrMa9CSvWDcdGkadAVFFPyuXSU2OQw/RR9dZF3/ZLILf9jHL3pWj/Scp8jWRl40y6sUxihUOXhhxpDCF8UVgnXdDCQf/W7gerRC/+3Zpr3LugVeSEuBgECld6XZnYNst/xbL9GHzEc7kDm7MIfz8nY8Ic7s="
1212

1313
script: admin/build.sh
1414

admin/pubring.asc

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
-----BEGIN PGP PUBLIC KEY BLOCK-----
22
Version: BCPG v1.49
33

4-
mQENBFVQyBQBCACcn/inogIi+IzDrqxg4RIUQ2d9HuFpXeOqBMXKT4Ddrxilc8GG
5-
HR2NZHH8G7ZInIrne4HNSVpYPyuH5pqHH6No2JyDRsjDu9eeRopMfADkEBkxZY6z
6-
dUUvkD8jofIczKDUWnPlBo5T0qDdYp9qfVoCLtJA80YkpREiH8itdp5CD+Jq5gCL
7-
LorXlAfv89DrqNYYkzxDkpcAhv6W5gbRmodafsjV1DMrleLKYHgPR+8zDcv36f1n
8-
KEj156DeQPHzRQDOoxZnJAT/b0bt3SfDiQJdNEnCzJh3kCvg0mejk0bKGrX8SpXg
9-
q0k0QK2p87HPQfSVdzTpWHXcDB/mTwn2cl2jABEBAAG0LnNjYWxhLXN3aW5nIDxz
10-
Y2FsYS1pbnRlcm5hbHNAZ29vZ2xlZ3JvdXBzLmNvbT6JARwEEwECAAYFAlVQyBQA
11-
CgkQ+V9S380juJxzqAf9EwtCZBz8Tokle07HyWfULWEnJniyCy7JtYh/Ajq/rP9r
12-
WKygZWmekRjfJujIqBFe7svRjPOLZ82h0ZSCvfd54dMZhNqFktRFMYLnJ4iCUF3B
13-
V5gCEhU/2h8LAyOmWTCLyhF0zFhGatbySpe4pXDElq98E80ti5iozi6sBnDxKdVy
14-
9Ngw17fDLhyflvreJG4qaYD1rmpks6NmCiL84x2kFraAuSnl0YCYfi7GIUWrUtjl
15-
PDk9Cex1o5r8NN1vijRcDpU4jD4NyF7G5/G1Qr9IB9ZZFJQbk1JLsI6v//70xI6Q
16-
C/mumWgyhJJHATA9OXTDfuT1Od0eN2E10Ez8u0mYvQ==
17-
=D3ls
4+
mQENBFVR64QBCACAJOLyHZ5IKrJG7bBbLm+PDm+3EvYXFv5kAZpDoAooG5HUMhoF
5+
6NA5fTa6WfHHih9yTd56YbsOEzk08VxlT2oE7NUcg2rDCBG/Iriyymn7ZR0HSR2K
6+
qEy5jfr7e/0h1xKd4TE2VGNaBzA1y/h4Sg08LvV3FbHYXOHeb1emIfakE/hVTmlo
7+
L2K0MF+KWpTkB1mXtZsNnoNSXEEN4tNlwzuPJK/A+auwFZ0yjEDRxgr5so+bkh2y
8+
MvTsXHOupn97CrZdJUCti49nEj5MSum3Ng/8vR7lNAf9Tz5I53CmSwyd35eCZJUY
9+
dL3NWHnNunMdDj5D0RA7dJIFaws+YlM/EXs5ABEBAAG0LnNjYWxhLXN3aW5nIDxz
10+
Y2FsYS1pbnRlcm5hbHNAZ29vZ2xlZ3JvdXBzLmNvbT6JARwEEwECAAYFAlVR64QA
11+
CgkQWu9VkpRCbxnXWQf/Tg7tdDK7zF3oyt8tsXZ7BQVTRL0J3AsddnrKw1KjfXzD
12+
ugxxD4saFapsZZ5W7Ify4ifacHeQemX5n1FxJOJ+opdiD6BbpNmaC2onwg4I0SDj
13+
1cnng34fdINb2xIjyxbSM34wukNEf8D5xZUlc+Eb5C6XhJpAJpD1LtkQeL5qvlHe
14+
w2f0imVdleLSg7JjUOFw2HxLypnHuSF8sTnh3TS2YHERf6F3QOBDKpvQYCERmjzz
15+
JYdBa3wZUEHU8+O40md+BUhV7iPSR35GR3NPX1Z+OZxMUGOdqkEuNnKBkdpj/ePu
16+
FUNKC+EtLfcE9ny6PwvCREPEJf00kpgUdUiYTtIjWA==
17+
=xCic
1818
-----END PGP PUBLIC KEY BLOCK-----

admin/secring.asc.enc

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)