diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-05-17 22:17:20 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-05-17 22:17:20 +0000 |
| commit | d3adee5105d4c7745b03ad23999d20fd42b3c575 (patch) | |
| tree | b1a67f0dfec96ab4ada3e5363317ce408269e46b /doc/README.md | |
| parent | f214efb87bd345490277b9962b43752c095c0b2c (diff) | |
| parent | d6c8a55189d62430c7ca4ffa6e5bb63f15a7efc1 (diff) | |
| download | gitlab-ce-sh-move-delete-groups-api-async.tar.gz | |
Merge branch 'master' into 'sh-move-delete-groups-api-async'sh-move-delete-groups-api-async
# Conflicts:
# lib/api/v3/groups.rb
Diffstat (limited to 'doc/README.md')
| -rw-r--r-- | doc/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/README.md b/doc/README.md index c929ba7a59e..ff8dd3fab8a 100644 --- a/doc/README.md +++ b/doc/README.md @@ -241,7 +241,7 @@ GitLab.com is hosted, managed, and administered by GitLab, Inc., with and teams: Free, Bronze, Silver, and Gold. GitLab.com subscriptions grants access -to the same features available in GitLab self-hosted, **expect +to the same features available in GitLab self-hosted, **except [administration](administration/index.md) tools and settings**: - GitLab.com Free includes the same features available in Core |