Skip to content
Snippets Groups Projects
Commit dcc8f7ba authored by Andy Brüchert's avatar Andy Brüchert
Browse files

Merge master into develop 

Conflicts:
	vendor/autoload.php
	vendor/composer/InstalledVersions.php
	vendor/composer/autoload_files.php
	vendor/composer/autoload_real.php
	vendor/composer/autoload_static.php
	vendor/composer/installed.json
	vendor/composer/installed.php
parents e3b598d8 569c72f4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment