diff options
| author | Evan Prodromou <evan@status.net> | 2009-10-31 14:45:46 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-10-31 14:45:46 -0400 |
| commit | 65cbf05f607a93f4eb34e0019035cc167e2ef032 (patch) | |
| tree | 4fad21845e4996e979f70b2e99aa96a1f30f8ee3 /README | |
| parent | f36162b218cd86a9281da2b5c50dc8db91e23ad5 (diff) | |
Revert "Revert "Added some explanatory text to README""
This reverts commit 446de62d02f372b6755237ae61e08bfcd4bf5100.
Conflicts:
README
htaccess.sample
Diffstat (limited to 'README')
| -rw-r--r-- | README | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -688,9 +688,13 @@ to users on a remote site. (Or not... it's not well tested.) The If fancy URLs is enabled, access to file attachments can also be restricted to logged-in users only. Uncomment the appropriate rewrite +<<<<<<< HEAD:README rule in .htaccess or your server's httpd.conf. (This most likely will not work if you are using a virtual server for attachments, so consider the performance/security tradeoff.) +======= +rule in .htaccess or your server's httpd.conf. +>>>>>>> 446de62... Revert "Added some explanatory text to README":README Upgrading ========= |