htaccess redirect
Merge remote branch 'origin/master'
ignore site-specific htaccess
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
adding db/structure.sql file
merging master
merging .gitignore changes