Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
miya0001 committed Mar 21, 2015
2 parents d4e1d88 + 8f71784 commit 8989093
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<Directory <%= @params[:docroot] %>>
Options FollowSymLinks
AllowOverride FileInfo Options
AllowOverride FileInfo Options Limit
Order allow,deny
Allow from all
</Directory>
Expand Down Expand Up @@ -35,7 +35,7 @@

<Directory <%= @params[:docroot] %>>
Options FollowSymLinks
AllowOverride FileInfo Options
AllowOverride FileInfo Options Limit
Order allow,deny
Allow from all
</Directory>
Expand Down

0 comments on commit 8989093

Please sign in to comment.