139 Commits

Author	SHA1	Message	Date
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	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	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
terrafrost	e942f9b1c3	README: misc updates	2019-07-02 07:03:46 -05:00
terrafrost	39eda40ed7	Merge branch '2.0'	2019-06-13 01:16:37 -05:00
terrafrost	60519001db	Merge branch '1.0' into 2.0	2019-06-13 01:15:54 -05:00
terrafrost	d77bb6e42b	1.0.16 release	2019-06-13 01:15:36 -05:00
terrafrost	47280b4e44	Merge branch '2.0'	2019-03-10 11:53:57 -05:00
terrafrost	11cf67cf78	Merge branch '1.0' into 2.0	2019-03-10 11:53:45 -05:00
terrafrost	849f997633	1.0.15 release	2019-03-10 11:51:38 -05:00
terrafrost	ee742d4edb	Merge branch '2.0'	2019-02-05 23:31:20 -06:00
terrafrost	8ebfcadbf3	Merge branch '1.0' into 2.0	2019-01-27 13:37:29 -06:00
terrafrost	7432a6959a	1.0.14 release	2019-01-27 13:35:10 -06:00
terrafrost	92f0ee0464	Merge branch '2.0'	2018-11-20 07:52:04 -06:00
terrafrost	7538b9c403	Merge branch '1.0' into 2.0	2018-11-20 07:50:46 -06:00
Andreas Fischer	403f756c82	README: Declare 2.0 branch as LTS. #1310	2018-11-14 21:42:06 +01:00
terrafrost	451949a5f3	Merge branch '2.0'	2018-11-04 00:46:10 -05:00
terrafrost	8814dc7841	Merge branch '1.0' into 2.0	2018-11-04 00:45:48 -05:00
terrafrost	20c35d9c75	1.0.12 release	2018-11-04 00:38:52 -05:00
henk23	cc6131a329	Fix composer require syntax in readme ... According to https://getcomposer.org/doc/03-cli.md#require	2018-05-10 15:51:30 +02:00
terrafrost	03d59d73c0	Merge branch '2.0'	2018-04-15 11:55:13 -05:00
terrafrost	7053f06f91	Merge branch '1.0' into 2.0	2018-04-15 11:55:05 -05:00
terrafrost	fd33675e48	1.0.11 release	2018-04-15 11:51:35 -05:00
terrafrost	1669e24269	Merge branch '2.0'	2018-02-18 22:29:37 -06:00
terrafrost	d305b78082	Merge branch '1.0' into 2.0	2018-02-18 22:29:13 -06:00
terrafrost	894ac25e17	1.0.10 release	2018-02-18 22:25:41 -06:00
terrafrost	7ed7ff2277	README: rm merge conflict code	2018-01-30 00:45:27 -06:00
terrafrost	489627f803	Merge branch '2.0'	2018-01-30 00:40:20 -06:00
terrafrost	2165445f39	Merge branch '1.0' into 2.0	2018-01-30 00:39:52 -06:00
terrafrost	6e9e61c7ca	README: rm patron link	2018-01-30 00:39:13 -06:00