diff options
| author | friendica <info@friendica.com> | 2013-08-11 16:59:34 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-08-11 16:59:34 -0700 |
| commit | 4eca591aed1e71a94c1f80b87aad9bb844199ffc (patch) | |
| tree | 44dd6b3031675bd2dc41697651eaa2f8aeaf5c6c | |
| parent | d7a9db10881b8d9de1b5f7e2a2dfae3df396fb45 (diff) | |
| parent | 94e589fee8fef5bc7937059c459564902a725c75 (diff) | |
| download | volse-hubzilla-4eca591aed1e71a94c1f80b87aad9bb844199ffc.tar.gz volse-hubzilla-4eca591aed1e71a94c1f80b87aad9bb844199ffc.tar.bz2 volse-hubzilla-4eca591aed1e71a94c1f80b87aad9bb844199ffc.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | doc/install/sample-lighttpd.conf (renamed from sample-lighttpd.conf) | 0 | ||||
| -rw-r--r-- | include/account.php | 1 | ||||
| -rw-r--r-- | install.txt | 2 |
3 files changed, 2 insertions, 1 deletions
diff --git a/sample-lighttpd.conf b/doc/install/sample-lighttpd.conf index 213719ac9..213719ac9 100644 --- a/sample-lighttpd.conf +++ b/doc/install/sample-lighttpd.conf diff --git a/include/account.php b/include/account.php index 6dfb5ae1e..ab442ab39 100644 --- 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) { diff --git a/install.txt b/install.txt index ecd0b190d..b25f22133 100644 --- 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 |