Merge branch 'dev' into stage
Merge branch 'dev' into stage
Merge branch 'dev' into stage
Merge branch 'dev' into stage
Add test to stage
Remove test on stage
Add another test file to stage
Remove test file
Add another test file to stage
Remove test file
Merge branch 'stage' into master
Disallow access of git directories
<Directory> was not allowed, trying <Files>
Doing .git protection with mod_rewrite instead
Redirect to staging domain if access via subfolder URL
Merge branch 'stage' into master

Conflicts:
	.htaccess
Merge branch 'refs/heads/dev' into stage
Merge branch 'refs/heads/dev' into stage
Merge branch 'refs/heads/stage'
Merge branch 'dev' into stage

Conflicts:
	.htaccess