Skip to content
Snippets Groups Projects
Commit 63356fc7 authored by Mateusz Uzdowski's avatar Mateusz Uzdowski
Browse files

Merge commit '1434fedf' into 1.0.1 

Note: commit above stands for 3.1.1 of the silverstirpe-installer.

Conflicts:
	.gitignore
	.htaccess
	CONTRIBUTING.md
	README.md
	assets/.htaccess
	assets/web.config
	behat.yml
	composer.json
	mysite/_config.php
	mysite/_config/config.yml
	mysite/code/Page.php
	phpunit.xml.dist
	web.config
parents 05efa925 1434fedf
No related branches found
Tags 1.0.1-rc4
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