93 Commits

Author	SHA1	Message	Date
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
terrafrost	0a58b73037	Merge branch '2.0'	2017-11-29 00:38:20 -06:00
terrafrost	c9a3fe35e2	Merge branch '1.0' into 2.0	2017-11-29 00:38:08 -06:00
terrafrost	2bab4e4bd6	1.0.9 release	2017-11-29 00:37:04 -06:00
terrafrost	12f7358c67	Merge branch '2.0'	2017-10-23 00:09:07 -05:00
terrafrost	f4b6a522df	Merge branch '1.0' into 2.0	2017-10-23 00:04:54 -05:00
terrafrost	817bebef47	README: update latest 1.0 version to 1.0.8	2017-10-23 00:03:25 -05:00
terrafrost	a2182d503f	Merge branch '2.0'	2017-09-09 20:40:25 -05:00
terrafrost	bcdb4b6c4a	Merge branch '1.0' into 2.0	2017-09-09 20:40:00 -05:00
terrafrost	76070ff5e2	README: add patreon link	2017-09-09 20:39:11 -05:00
terrafrost	f5e0cab82d	Merge branch '2.0'	2017-06-05 01:33:15 -05:00
terrafrost	6ecf69b201	Merge branch '1.0' into 2.0	2017-06-05 01:25:41 -05:00
terrafrost	55623933f3	1.0.7 release	2017-06-05 01:22:53 -05:00
terrafrost	7882249a14	Merge branch '2.0'	2017-05-08 00:58:42 -05:00
terrafrost	f8dd0e18d2	Merge branch '1.0' into 2.0	2017-05-08 00:58:35 -05:00
terrafrost	aa8368ed12	README: add 1.0.6 release	2017-05-08 00:58:24 -05:00
Andreas Fischer	74abcb45ed	Merge branch '2.0' ... * 2.0: README: Fix typos.	2016-12-25 16:50:17 +01:00
Andreas Fischer	00325a3050	Merge branch '1.0' into 2.0 ... * 1.0: README: Fix typos.	2016-12-25 16:50:17 +01:00
Andreas Fischer	a0e6bd87f2	README: Fix typos.	2016-12-25 16:09:17 +01:00
terrafrost	68b5a8896f	Merge branch '2.0'	2016-12-24 20:06:51 -06:00
terrafrost	f74ba2c581	Merge branch '1.0' into 2.0	2016-12-24 19:49:30 -06:00
Andreas Fischer	c7390e26f5	README: Reword 1.0 PEAR installation instructions.	2016-12-18 11:08:04 +01:00
Andreas Fischer	804cade3c0	README: Add branches section.	2016-12-18 11:02:41 +01:00
Andreas Fischer	bd5b8809e8	README: Merge 'Installing Development Dependencies' into 'Contributing'.	2016-12-18 10:40:25 +01:00
Andreas Fischer	d0d26cd29f	README: Remove pipe into php.	2016-12-18 10:38:28 +01:00
Andreas Fischer	3cebd4ec59	README: Update Coverage and API URLs.	2016-12-18 10:32:35 +01:00
terrafrost	2d2bf2990e	Merge branch '2.0'	2016-11-08 09:23:53 -06:00
terrafrost	9e15d0c583	Merge branch '1.0' into 2.0	2016-10-22 13:11:38 -05:00
terrafrost	38fa7332e9	update for 1.0.5 release..	2016-10-22 12:53:16 -05:00
terrafrost	d66b6c251c	Merge branch '2.0'	2016-10-03 19:57:11 -05:00
terrafrost	ab8028c93c	Merge branch '1.0' into 2.0	2016-10-03 19:57:04 -05:00
terrafrost	2dfe9c5de7	README: update download link to 1.0.4	2016-10-03 19:56:50 -05:00
terrafrost	5416b9eddc	Merge branch '2.0'	2016-08-28 10:45:37 -05:00
terrafrost	41f85e9c25	Merge branch '1.0' into 2.0	2016-08-18 13:49:14 -05:00
terrafrost	c27fd2e66f	updates for 1.0.3 release	2016-08-18 13:43:04 -05:00
terrafrost	a3fdde757d	Merge branch '2.0'	2016-05-07 19:01:46 -05:00
terrafrost	511a7b77ba	Merge branch '1.0' into 2.0	2016-05-07 19:01:31 -05:00
terrafrost	b8f3a76632	README: update download link	2016-05-07 19:01:00 -05:00
terrafrost	398a795e1f	Revert "undo merging of master to 2.0 branch" ... This reverts commit 8fb4c3363d.	2016-04-30 16:23:35 -05:00
terrafrost	8fb4c3363d	undo merging of master to 2.0 branch	2016-04-28 15:34:10 -05:00
terrafrost	b4cf10fc94	Revert "Merge branch '2.0'" ... This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing changes made to 638fe6971c.	2016-04-10 11:30:59 -05:00
terrafrost	4b69dcb1ca	Revert "Merge remote-tracking branch 'bantu/bootstrap'" ... This reverts commit ef04c870e9, reversing changes made to cd57bf31ae.	2016-04-10 11:25:31 -05:00
terrafrost	0f1eca35ac	Merge branch '2.0'	2016-01-18 11:07:26 -06:00
terrafrost	ba6fb78f72	Merge branch '1.0' into 2.0	2016-01-18 11:07:21 -06:00
terrafrost	f60e365be2	README: update download link	2016-01-18 11:07:12 -06:00
Andreas Fischer	e7cf8ae383	Merge branch '2.0' ... * 2.0: README: Use the svg Travis image	2015-11-19 09:38:20 +01:00
Andreas Fischer	43e8bb8273	Merge branch '1.0' into 2.0 ... * 1.0: README: Use the svg Travis image	2015-11-19 09:37:14 +01:00