Merge branch 'master' into develop

2012-01-09 01:36:23 +00:00
parent 147237e5bd 58b89d7c0c
commit 71faa32cbd
1 changed files with 7 additions and 0 deletions
--- a/private/settings.txt.dist
+++ b/private/settings.txt.dist
@@ -29,7 +29,14 @@ value="default"
 type=string
 value=/dev/shm/homepage

+[templates.tmp_path]
+type="string"
+value="/var/tmp/homepage/"
+
 [debug.display_exceptions]
 type=bool
 value=1

+[auth]
+type="string"
+value="FlatFile"