aboutsummaryrefslogtreecommitdiff
path: root/files/ja
diff options
context:
space:
mode:
Diffstat (limited to 'files/ja')
-rw-r--r--files/ja/_redirects.txt1
-rw-r--r--files/ja/_wikihistory.json14
-rw-r--r--files/ja/conflicting/web/css/index.html (renamed from files/ja/web/css/tools/index.html)3
3 files changed, 10 insertions, 8 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 6117892834..de680f387d 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3683,6 +3683,7 @@
/ja/docs/Web/CSS/Reference/@viewport/zoom /ja/docs/Web/CSS/@viewport
/ja/docs/Web/CSS/Reference/Mozilla_Extensions /ja/docs/Web/CSS/Mozilla_Extensions
/ja/docs/Web/CSS/Scaling_background_images /ja/docs/Web/CSS/CSS_Backgrounds_and_Borders/Resizing_background_images
+/ja/docs/Web/CSS/Tools /ja/docs/conflicting/Web/CSS
/ja/docs/Web/CSS/Understanding_z_index /ja/docs/Web/CSS/CSS_Positioning/Understanding_z_index
/ja/docs/Web/CSS/Understanding_z_index/Adding_z-index /ja/docs/Web/CSS/CSS_Positioning/Understanding_z_index/Adding_z-index
/ja/docs/Web/CSS/Understanding_z_index/Stacking_and_float /ja/docs/Web/CSS/CSS_Positioning/Understanding_z_index/Stacking_and_float
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 71a15c0761..44f4c575d1 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -29309,13 +29309,6 @@
"sii"
]
},
- "Web/CSS/Tools": {
- "modified": "2020-07-21T12:48:32.485Z",
- "contributors": [
- "mfuji09",
- "sii"
- ]
- },
"Web/CSS/Type_selectors": {
"modified": "2020-10-15T21:20:42.015Z",
"contributors": [
@@ -48609,6 +48602,13 @@
"Jeremie"
]
},
+ "conflicting/Web/CSS": {
+ "modified": "2020-07-21T12:48:32.485Z",
+ "contributors": [
+ "mfuji09",
+ "sii"
+ ]
+ },
"orphaned/Building_a_Mozilla_Distribution": {
"modified": "2019-03-23T23:49:07.062Z",
"contributors": [
diff --git a/files/ja/web/css/tools/index.html b/files/ja/conflicting/web/css/index.html
index fb51e9d15d..9585f457ed 100644
--- a/files/ja/web/css/tools/index.html
+++ b/files/ja/conflicting/web/css/index.html
@@ -1,12 +1,13 @@
---
title: ツール
-slug: Web/CSS/Tools
+slug: conflicting/Web/CSS
tags:
- CSS
- Guide
- NeedsUpdate
- ガイド
translation_of: Web/CSS/Tools
+original_slug: Web/CSS/Tools
---
<div></div>