Merge branch 'master' of github.com:humhub/humhub

This commit is contained in:
Lucas Bartholemy 2017-10-13 22:34:27 +02:00
commit c6ff344f10
2 changed files with 3 additions and 1 deletions

View File

@ -5,7 +5,6 @@
### What do you get instead? ### What do you get instead?
### Additional info ### Additional info
| Q | A | Q | A
@ -13,3 +12,5 @@
| HumHub version | 1.? | HumHub version | 1.?
| PHP version | | PHP version |
| Operating system | | Operating system |
> Note: Please use the [community](https://community.humhub.com) site for any questions on customizing HumHub.

View File

@ -4,6 +4,7 @@ RewriteEngine on
# uncomment to force https requests # uncomment to force https requests
#RewriteCond %{HTTPS} !=on #RewriteCond %{HTTPS} !=on
#RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/.*$ [NC]
#RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] #RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]