Commit Graph
10 Commits
Author SHA1 Message Date
Dries Vints eb080e5cee Merge branch 'master' into develop 2020-04-27 16:33:05 +02:00
Dries Vints 785405b34b Merge branch '6.x' 2020-04-27 16:32:54 +02:00
Dries Vints 919a04914f Merge branch 'master' into develop 2020-04-16 09:47:44 +02:00
Dries Vints 3cdfe0ce95 Merge branch '6.x'
# Conflicts:
#	CHANGELOG.md
2020-04-16 09:47:28 +02:00
Dries Vints 8aab222c12 Update CHANGELOG.md 2020-04-16 09:45:26 +02:00
Dries Vints 8be1fd4001 Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
2020-04-15 13:47:54 +02:00
Dries Vints b5f008a8bf Update CHANGELOG.md 2020-04-15 13:46:52 +02:00
Dries Vints 103fc0b451 Merge pull request #5278 from voyula/patch-1
[7.x] Normalize Style
2020-04-14 10:58:32 +02:00
Dries Vints 0dbc6350b9 Merge branch 'master' into develop 2020-04-09 16:58:04 +02:00
Dries Vints e2c9261c2d Merge branch '6.x' 2020-04-09 16:56:58 +02:00