summaryrefslogtreecommitdiff
path: root/htaccess.sample
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-09-08 16:02:57 -0700
committerZach Copley <zach@controlyourself.ca>2009-09-08 16:02:57 -0700
commit9d87313eaebe8240393ac300a435f3b1332c8849 (patch)
tree6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a /htaccess.sample
parent5efe588174c71979fc1970353c9a556ea441f138 (diff)
parentbeae3db41375879e725af053edf8041bbd76ac8c (diff)
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts: plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'htaccess.sample')
-rw-r--r--htaccess.sample2
1 files changed, 1 insertions, 1 deletions
diff --git a/htaccess.sample b/htaccess.sample
index 942e98334..37eb8e01e 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -1,7 +1,7 @@
<IfModule mod_rewrite.c>
RewriteEngine On
- # NOTE: change this to your actual Laconica path; may be "/".
+ # NOTE: change this to your actual StatusNet path; may be "/".
RewriteBase /mublog/