Merge branch '3.6'

This commit is contained in:
Dylan K. Taylor
2019-02-09 19:22:00 +00:00
20 changed files with 422 additions and 126 deletions

2
composer.lock generated
View File

@ -277,7 +277,7 @@
{
"name": "Berry Langerak",
"email": "berry@berryllium.nl",
"role": "Developer"
"role": "developer"
},
{
"name": "Rick van der Staaij",