diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-18 15:44:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-18 15:44:36 +0000 |
| commit | 039b0c0dbd956e458000fb4f3f7cf0a638098912 (patch) | |
| tree | f5eb6da09c323ca451f7d10fc91d99d45fc82d61 /doc/user/reserved_names.md | |
| parent | b4c1080494069f81be4c733fdad52a51d1f0d682 (diff) | |
| parent | 3c725a2a5d340a2edae8a79ad6af3a0924cc8f14 (diff) | |
| download | gitlab-ce-039b0c0dbd956e458000fb4f3f7cf0a638098912.tar.gz | |
Merge branch 'master' into 'security-fj-bumping-sanitize-gem'
# Conflicts:
# Gemfile.rails5.lock
Diffstat (limited to 'doc/user/reserved_names.md')
| -rw-r--r-- | doc/user/reserved_names.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/user/reserved_names.md b/doc/user/reserved_names.md index 6c1378560ef..918daee5d9f 100644 --- a/doc/user/reserved_names.md +++ b/doc/user/reserved_names.md @@ -58,6 +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 |