Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 16:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master' into develop

Browse source 
Conflicts:
	boot.php
This commit is contained in:
Michael Vogel 2016-07-21 22:48:34 +02:00
commit 2e9d233367
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.htaccess
View file

@ -37,5 +37,10 @@ AddType audio/ogg .oga
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ index.php?pagename=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
# If you want to restrict access to your Friendica site to HTTPS only,
# uncommment the following lines
#RewriteCond %{HTTPS} !=on
#RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L]
</IfModule>