220 Commits

Author SHA1 Message Date
Dries Vints
99d5ca2845
Update CHANGELOG.md 2021-06-15 17:48:56 +02:00
Dries Vints
92cd828c64
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-06-01 17:49:55 +02:00
Dries Vints
0296bb63e1
Update CHANGELOG.md 2021-06-01 17:49:26 +02:00
Dries Vints
507d499577
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-05-18 17:38:28 +02:00
Dries Vints
afa06fac2a
Update CHANGELOG.md 2021-05-18 17:37:20 +02:00
Dries Vints
72c6aaa8df
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
#	composer.json
2021-05-11 22:50:27 +02:00
Dries Vints
b1b28a6bb1
Update CHANGELOG.md 2021-05-11 22:49:31 +02:00
Dries Vints
dd8111a32d
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
#	tests/Feature/ExampleTest.php
#	tests/Unit/ExampleTest.php
2021-04-20 18:14:47 +02:00
Dries Vints
a6ffdbdf41
Update CHANGELOG.md 2021-04-20 18:13:08 +02:00
Dries Vints
9e920323de
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-03-23 18:26:04 +01:00
Dries Vints
6bc0b1cfcb
Update CHANGELOG.md 2021-03-23 18:25:11 +01:00
Dries Vints
f51adc5b53
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-03-16 17:26:56 +01:00
Dries Vints
57ddc0ebbb
Update CHANGELOG.md 2021-03-16 17:26:11 +01:00
Dries Vints
38207d610d
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-03-09 20:10:21 +01:00
Dries Vints
a315767e09
Update CHANGELOG.md 2021-03-09 20:09:48 +01:00
Dries Vints
941bd32ea8
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-03-02 17:37:08 +01:00
Dries Vints
20455c6f5f
Update CHANGELOG.md 2021-03-02 17:36:09 +01:00
Dries Vints
b2ac03183b
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-02-23 21:43:40 +01:00
Dries Vints
06d967a4c7
Update CHANGELOG.md 2021-02-23 21:43:02 +01:00
Dries Vints
828f2d4401
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-02-16 17:59:48 +01:00
Dries Vints
689c0e5a23
Update CHANGELOG.md 2021-02-16 17:57:31 +01:00
Dries Vints
6d3e5ed928
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
#	docker-compose.yml
2021-01-19 16:22:05 +01:00
Dries Vints
a96fe93207
Update CHANGELOG.md 2021-01-19 16:20:53 +01:00
Dries Vints
cdd79ce5cf
Update CHANGELOG.md 2021-01-12 18:39:43 +01:00
Dries Vints
c6059645a6
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-01-05 16:49:44 +01:00
Dries Vints
f9f39ee7ac
Update CHANGELOG.md 2021-01-05 16:48:16 +01:00
Dries Vints
b1c8ffa1b0
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-12-22 18:08:32 +01:00
Dries Vints
454f0e1abe
Update CHANGELOG.md 2020-12-22 18:07:44 +01:00
Dries Vints
501766f1eb
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-12-15 14:18:27 +01:00
Dries Vints
0059fb91be
Update CHANGELOG.md 2020-12-15 14:17:57 +01:00
Dries Vints
858b094b62
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-12-01 16:30:52 +01:00
Dries Vints
0717bb0291
Update CHANGELOG.md 2020-12-01 16:21:29 +01:00
Dries Vints
d4cf3e2c71
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-11-24 18:21:08 +01:00
Dries Vints
86b1b3f20a
Update CHANGELOG.md 2020-11-24 18:18:56 +01:00
Dries Vints
e253d4ebb9
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-11-17 17:41:01 +01:00
Dries Vints
e8498122a2
Update CHANGELOG.md 2020-11-17 17:40:17 +01:00
Dries Vints
e4517a8951
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-11-10 15:58:52 +01:00
Dries Vints
3d7a5075e7
Update CHANGELOG.md 2020-11-10 15:57:51 +01:00
Dries Vints
1aa50f0e4c
Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-11-03 20:02:43 +01:00
Dries Vints
d9e85605cb
Update CHANGELOG.md 2020-11-03 20:02:19 +01:00
Dries Vints
c31edfe4f0
Merge branch 'master' into develop 2020-10-31 10:21:22 +01:00
Dries Vints
efdde1e928
Merge branch '7.x'
# Conflicts:
#	CHANGELOG.md
2020-10-31 10:21:07 +01:00
Dries Vints
3923e7f7c4
Update CHANGELOG.md 2020-10-31 10:17:45 +01:00
Dries Vints
1d1dc13d6b
Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-30 16:09:57 +01:00
Dries Vints
3e9fd59156
Update CHANGELOG.md 2020-10-30 16:07:53 +01:00
Dries Vints
8b947ba34c
Merge branch '7.x'
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-30 16:05:55 +01:00
Dries Vints
509708c7ee
Update CHANGELOG.md 2020-10-30 16:03:50 +01:00
Dries Vints
45fa128adb
Merge branch '6.x' into 7.x
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-30 15:43:30 +01:00
Dries Vints
d85be86698
Update CHANGELOG.md 2020-10-30 15:40:46 +01:00
Dries Vints
0d5d51fb5d
Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-29 14:35:38 +01:00