Permalink
Browse files

Merge conflict

  • Loading branch information...
2 parents 6df1c4b + c89dc9c commit 68241f521492ab005ad8d3bbbaf4a9f0f51df83c @marcusramberg marcusramberg committed Aug 2, 2009
Showing with 11 additions and 0 deletions.
  1. +11 −0 mojomojo.conf
View
@@ -32,6 +32,17 @@ index_dir __path_to(index)__
verify_address 0
</session>
+<permissions>
+ check_permission_on_view 1
+ cache_permission_data 1
+ enforce_login 0
+ create_allowed 1
+ delete_allowed 1
+ edit_allowed 1
+ view_allowed 1
+ attachment_allowed 1
+</permissions>
+
<environment>
RECAPTCHA_PUBLIC_KEY 6LcsbAAAAAAAAPDSlBaVGXjMo1kJHwUiHzO2TDze
RECAPTCHA_PRIVATE_KEY 6LcsbAAAAAAAANQQGqwsnkrTd7QTGRBKQQZwBH-L

0 comments on commit 68241f5

Please sign in to comment.