Merge pull request 'dev_10' (#2) from dev_10 into master

fix merge conflict
5 months ago · 01d4d6c1e6
parent e09647cfd5 719d2decd6
commit 01d4d6c1e6
6 changed files with 27 additions and 0 deletions
--- a/.user.ini
+++ b/.user.ini
--- a/wp-content/ai1wm-backups/.htaccess
+++ b/wp-content/ai1wm-backups/.htaccess
@ -0,0 +1,9 @@
+<IfModule mod_mime.c>
+AddType application/octet-stream .wpress
+</IfModule>
+<IfModule mod_dir.c>
+DirectoryIndex index.php
+</IfModule>
+<IfModule mod_autoindex.c>
+Options -Indexes
+</IfModule>
--- a/wp-content/ai1wm-backups/index.html
+++ b/wp-content/ai1wm-backups/index.html
@ -0,0 +1 @@
+Kangaroos cannot jump here
--- a/wp-content/ai1wm-backups/index.php
+++ b/wp-content/ai1wm-backups/index.php
@ -0,0 +1 @@
+Kangaroos cannot jump here
--- a/wp-content/ai1wm-backups/robots.txt
+++ b/wp-content/ai1wm-backups/robots.txt
@ -0,0 +1,3 @@
+User-agent: *
+Disallow: /ai1wm-backups/
+Disallow: /wp-content/ai1wm-backups/
--- a/wp-content/ai1wm-backups/web.config
+++ b/wp-content/ai1wm-backups/web.config
@ -0,0 +1,13 @@
+<configuration>
+<system.webServer>
+<staticContent>
+<mimeMap fileExtension=".wpress" mimeType="application/octet-stream" />
+</staticContent>
+<defaultDocument>
+<files>
+<add value="index.php" />
+</files>
+</defaultDocument>
+<directoryBrowse enabled="false" />
+</system.webServer>
+</configuration>