Merge remote-tracking branch 'friendika/master'

12 years ago · e8a29c64ca
parent 2c2df90dc0 e3e27458f8
commit e8a29c64ca
1 changed files with 1 additions and 2 deletions
--- a/.htaccess
+++ b/.htaccess
@ -1,4 +1,4 @@
-#Options -Indexes
+Options -Indexes
 AddType application/x-java-archive .jar
 AddType audio/ogg .oga

@ -11,7 +11,6 @@ Deny from all

  # Protect repository directory from browsing
  RewriteRule "(^|/)\.git" - [F]
-  RewriteBase /~fabio/friendika

  # Rewrite current-style URLs of the form 'index.php?q=x'.
  # Also place auth information into REMOTE_USER for sites running