Merge branch 'hotfix/114' into develop

Forward port #114
zfcampus · Jan 27, 2016 · d8ff144 · d8ff144
2 parents bafee99 + cf2de12
commit d8ff144
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/puphpet/files/exec-always/empty b/puphpet/files/exec-always/empty
diff --git a/puphpet/files/exec-always/set-local.sh b/puphpet/files/exec-always/set-local.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+echo "Setting locale to fix encoding"
+sh -c "echo 'LC_ALL=en_US.UTF-8' >> /etc/environment"
+echo "done setting locale"