Merge https://github.com/friendica/red into zpull

2013-08-11 16:59:34 -07:00 · 2013-08-11 16:59:34 -07:00 · 4eca591aed
commit 4eca591aed
parent d7a9db1088 94e589fee8
3 changed files with 2 additions and 1 deletions
--- a/doc/install/sample-lighttpd.conf
+++ b/doc/install/sample-lighttpd.conf
--- a/include/account.php
+++ b/include/account.php
@ -6,6 +6,7 @@ require_once('include/plugin.php');
 require_once('include/text.php');
 require_once('include/language.php');
 require_once('include/datetime.php');
+require_once('include/crypto.php');


 function check_account_email($email) {
--- a/install.txt
+++ b/install.txt
@ -47,7 +47,7 @@ you might have trouble getting everything to work.]
        
        `mkdir view/tpl/smarty3`
        
-        `chown 777 view/smarty3`
+        `chmod 777 view/tpl/smarty3`
    
    - For installing addons