Merge remote-tracking branch 'upstream/master'

JamBrain · Dec 13, 2016 · d41a987 · d41a987
2 parents 2ba0e25 + 51cc782
commit d41a987
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Force LF line endings on Windows.
+* text eol=lf
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -10,4 +10,4 @@ SCRIPTPATH=$(dirname "$SCRIPT")
 cd $SCRIPTPATH
 
 (cd apache ; sh add-ports.sh)
-(cd db ; echo YES | php table-create)
+(cd /vagrant/www/src/shrub/tools; echo YES | php table_create)