Commit Graph

166 Commits

Author SHA1 Message Date
Jack Worman
2c40186711 Paratest 2022-10-16 09:55:20 -05:00
terrafrost
b722a4f002 Merge branch '3.0' 2022-03-08 08:53:21 -06:00
Jack Worman
46758107de GitHub actions 2022-03-08 06:08:01 -06:00
terrafrost
004aec954f Merge branch '3.0' 2022-02-19 18:08:40 -06:00
Jack Worman
ea9f6540f3 PSR12 fixes
PSR12 fixes
2022-02-19 17:06:13 -06:00
terrafrost
cc65aa3b0e Merge branch '3.0' 2022-02-01 21:21:16 -06:00
Jack Worman
f900045772 updated contribution steps
updated contribution steps
2022-02-01 20:46:16 -06:00
terrafrost
dc5a5fafb6 Merge branch '3.0' 2022-02-01 07:01:26 -06:00
terrafrost
ea3bee985c Merge branch '2.0' into 3.0 2022-02-01 07:01:19 -06:00
terrafrost
324f844e1e Merge branch '1.0' into 2.0 2022-02-01 07:01:12 -06:00
terrafrost
bd8f02906e add ChargeOver as a sponsor - thanks!! 2022-02-01 07:00:55 -06:00
terrafrost
08c279de73 Merge branch '3.0' 2021-12-28 00:28:25 -06:00
terrafrost
438241b6c2 Merge branch '1.0' into 3.0 2021-12-28 00:27:33 -06:00
terrafrost
70a2120458 Merge branch '0.0' into 2.0 2021-12-28 00:27:18 -06:00
terrafrost
b3a606b90c add 1.0.20 release 2021-12-28 00:26:23 -06:00
terrafrost
4671b10d14 Merge branch '3.0' 2021-12-04 15:11:34 -06:00
terrafrost
2bcb643660 Merge branch '2.0' into 3.0 2021-12-04 15:10:52 -06:00
terrafrost
f0a7fc8e63 Merge branch '1.0' into 2.0 2021-12-04 15:09:37 -06:00
terrafrost
e0068833b5 README: fix travis-ci.com link 2021-12-04 15:01:33 -06:00
terrafrost
a4b280de10 Merge branch '3.0' 2021-11-17 09:25:11 -06:00
terrafrost
24c26e63e9 Merge branch '2.0' into 3.0 2021-11-17 09:25:04 -06:00
terrafrost
ce5c4ee8c9 Merge branch '1.0' into 2.0 2021-11-17 09:22:52 -06:00
terrafrost
25ccee1238 BACKERS: add Allan Simon 2021-11-17 09:22:30 -06:00
terrafrost
2e3e8b13b8 Merge branch '3.0' 2020-12-17 00:11:17 -06:00
terrafrost
b28b9472c8 Merge branch '2.0' into 3.0 2020-12-16 23:59:48 -06:00
terrafrost
f0d91cccd8 Merge branch '1.0' into 2.0 2020-12-16 23:34:24 -06:00
terrafrost
b2bdbaa4f4 README: update for 3.0.0 release 2020-12-16 23:33:42 -06:00
terrafrost
fefac4ba66 README: make travis-ci.com run for master branch instead of 3.0 2020-11-21 12:17:36 -06:00
terrafrost
aae9131bec Merge branch '3.0' 2020-11-21 12:16:56 -06:00
terrafrost
a609b9fcf5 Merge branch '2.0' into 3.0 2020-11-21 12:11:38 -06:00
terrafrost
f6d441e9ac Merge branch '1.0' into 2.0 2020-11-21 11:59:51 -06:00
terrafrost
40b67bf939 README: travis-ci.org -> travis-ci.com 2020-11-21 11:55:24 -06:00
Andreas Fischer
51143184c1 Merge branch '3.0'
* 3.0:
  Move Doctum config files to phpseclib/api-docs
2020-08-21 18:20:59 +02:00
Andreas Fischer
2285601cf3 Merge branch '2.0' into 3.0
* 2.0:
  Move Doctum config files to phpseclib/api-docs
2020-08-21 18:20:24 +02:00
Andreas Fischer
901382d724 Merge branch '1.0' into 2.0
* 1.0:
  Move Doctum config files to phpseclib/api-docs
2020-08-21 18:19:41 +02:00
William Desportes
ceab38e0b8
Move Doctum config files to phpseclib/api-docs
Fixes: #1365
Closes: #416
Closes: #1506
2020-08-21 18:06:03 +02:00
terrafrost
30eed17c2f Merge branch '2.0' into 3.0 2020-07-07 23:35:22 -05:00
terrafrost
6a13b52d80 Merge branch '1.0' into 2.0 2020-07-07 23:35:07 -05:00
terrafrost
6537e74746 1.0.19 release 2020-07-07 23:31:58 -05:00
terrafrost
7cbeb7df48 Merge branch '2.0' into 3.0 2019-10-05 19:56:57 -05:00
terrafrost
cf8a7ef715 Merge branch '1.0' into 2.0 2019-10-05 19:56:28 -05:00
Andreas Fischer
e37b7a7e48 Remove obsolete code coverage upload solution. 2019-10-05 09:43:08 +02:00
terrafrost
2fee8e22c1 Merge branch '2.0' into 3.0 2019-09-16 23:12:19 -05:00
terrafrost
dc075281ba Merge branch '1.0' into 2.0 2019-09-16 23:12:11 -05:00
terrafrost
ec1fcfe648 1.0.18 release 2019-09-16 23:11:10 -05:00
terrafrost
853649320b Merge branch '2.0' 2019-09-15 18:24:00 -05:00
terrafrost
30ae777ef6 Merge branch '1.0' into 2.0 2019-09-15 18:23:49 -05:00
terrafrost
db324e5d01 1.0.17 release 2019-09-15 18:22:55 -05:00
terrafrost
113f8dec08 Merge branch '2.0' 2019-07-02 07:12:24 -05:00
terrafrost
c583406f18 Merge branch '1.0' into 2.0 2019-07-02 07:04:02 -05:00