Merge remote-tracking branch 'friendika/master'

This commit is contained in:
Fabio Comuni 2011-07-06 16:22:16 +02:00
commit e8a29c64ca

View file

@ -1,4 +1,4 @@
#Options -Indexes Options -Indexes
AddType application/x-java-archive .jar AddType application/x-java-archive .jar
AddType audio/ogg .oga AddType audio/ogg .oga
@ -11,7 +11,6 @@ Deny from all
# Protect repository directory from browsing # Protect repository directory from browsing
RewriteRule "(^|/)\.git" - [F] RewriteRule "(^|/)\.git" - [F]
RewriteBase /~fabio/friendika
# Rewrite current-style URLs of the form 'index.php?q=x'. # Rewrite current-style URLs of the form 'index.php?q=x'.
# Also place auth information into REMOTE_USER for sites running # Also place auth information into REMOTE_USER for sites running