summaryrefslogtreecommitdiff
path: root/doc/development/README.md
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-10-09 12:52:51 +0000
committerRobert Speicher <robert@gitlab.com>2017-10-09 12:52:51 +0000
commit2409acfa7f97fef81dd66640c64e9d0008b85cde (patch)
tree1dcafa5cd5b4646ddaf6d736cc2a15d60d0f0c19 /doc/development/README.md
parent0f366c74131339cb45c8943437fe5b3e68721c75 (diff)
parentf277fa14094e5515e2317d2baa1fa0bfb95966da (diff)
downloadgitlab-ce-2409acfa7f97fef81dd66640c64e9d0008b85cde.tar.gz
Merge branch 'master' into 'group-sort-dropdown-blank'
# Conflicts: # spec/features/dashboard/group_spec.rb
Diffstat (limited to 'doc/development/README.md')
-rw-r--r--doc/development/README.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/development/README.md b/doc/development/README.md
index 1448a4c0414..b648c7ce086 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -64,9 +64,11 @@
- [Hash Indexes](hash_indexes.md)
- [Swapping Tables](swapping_tables.md)
-## i18n
+## Internationalization (i18n)
-- [Internationalization for GitLab](i18n_guide.md)
+- [Introduction](i18n/index.md)
+- [Externalization](i18n/externalization.md)
+- [Translation](i18n/translation.md)
## Compliance