Commit Graph

201 Commits

Author SHA1 Message Date
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
Dries Vints
4966dd9baf Update CHANGELOG.md 2020-10-29 14:33:50 +01:00
Dries Vints
2460441818 Merge branch '7.x'
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-29 14:32:54 +01:00
Dries Vints
482d68a182 Update CHANGELOG.md 2020-10-29 14:26:10 +01:00
Dries Vints
056a9e8f90 Merge branch '6.x' into 7.x
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-29 14:23:32 +01:00
Dries Vints
aef279a6cf Update CHANGELOG.md 2020-10-29 14:17:39 +01:00
Dries Vints
a4d45e6940 Update CHANGELOG.md 2020-10-29 14:15:43 +01:00
Dries Vints
71c6571fc8 Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
2020-10-20 20:34:45 +02:00
Dries Vints
d82d7505a1 Update CHANGELOG.md 2020-10-20 20:34:02 +02:00
Dries Vints
13668dd89f Update CHANGELOG.md 2020-10-06 18:12:53 +02:00
Dries Vints
c66546e75f Update CHANGELOG.md 2020-10-06 18:11:27 +02:00
Dries Vints
f5161080d4 Update CHANGELOG.md 2020-10-06 18:08:05 +02:00
Dries Vints
6a9d5e0da1 Merge branch '7.x' into master
# Conflicts:
#	CHANGELOG.md
2020-09-21 18:12:33 +02:00
Dries Vints
4eeb29ee12 Update changelog 2020-09-21 17:59:16 +02:00
Graham Campbell
3a5f05ce80 Merge branch 'master' into develop 2020-08-26 09:39:57 +01:00
Graham Campbell
2c69ec987e Merge branch '6.x' into master 2020-08-26 09:39:37 +01:00
Dries Vints
57cc899099 Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-08-11 19:45:48 +02:00
Dries Vints
fa43c0a333 Update CHANGELOG.md 2020-08-11 19:44:47 +02:00
Dries Vints
921b14b954 Update CHANGELOG.md 2020-08-11 19:16:01 +02:00
Dries Vints
919a04914f Merge branch 'master' into develop 2020-04-16 09:47:44 +02:00