summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-06-07 16:54:41 +0000
committerDouwe Maan <douwe@gitlab.com>2018-06-07 16:54:41 +0000
commit290ca339adc952bcd939d1782af95f90d3b88716 (patch)
tree99d6b6bc75727949f1d3410bef321d31406668ca /doc/user
parent7b562c972713d19c2e537eb4df7cbe072ada8bbe (diff)
parent366e1331692900300df42e9c38fc17bd46b7ca1c (diff)
downloadgitlab-ce-290ca339adc952bcd939d1782af95f90d3b88716.tar.gz
Merge branch 'feature/customizable-favicon' into 'master'
Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/reserved_names.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/reserved_names.md b/doc/user/reserved_names.md
index 50ec99be48b..6c1378560ef 100644
--- a/doc/user/reserved_names.md
+++ b/doc/user/reserved_names.md
@@ -58,7 +58,7 @@ Currently the following names are reserved as top level groups:
- dashboard
- deploy.html
- explore
-- favicon.ico
+- favicon.png
- groups
- header_logo_dark.png
- header_logo_light.png