summaryrefslogtreecommitdiff
path: root/doc/security/README.md
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-02-01 15:49:03 +0100
committerJames Lopez <james@jameslopez.es>2016-02-01 15:49:03 +0100
commit850942ceba1e9f6918c1234e9b72c261af86de82 (patch)
tree1d38d963657cf7fd559431e2e62962f8c95db8ac /doc/security/README.md
parent927ab48101d44976e174b13323d085aa5f846155 (diff)
parentda8e0f86595299740a344309cb5963854b61c4a6 (diff)
downloadgitlab-ce-850942ceba1e9f6918c1234e9b72c261af86de82.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue
Diffstat (limited to 'doc/security/README.md')
-rw-r--r--doc/security/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/security/README.md b/doc/security/README.md
index f34c792d005..be1abb88c3d 100644
--- a/doc/security/README.md
+++ b/doc/security/README.md
@@ -7,4 +7,4 @@
- [Reset your root password](reset_root_password.md)
- [User File Uploads](user_file_uploads.md)
- [How we manage the CRIME vulnerability](crime_vulnerability.md)
-- [Enforce Two-Factor authentication](two_factor_authentication.md)
+- [Enforce Two-factor authentication](two_factor_authentication.md)