diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2018-07-03 15:30:09 +0200 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-07-03 15:30:09 +0200 |
| commit | 1432e5605c1d77fc76aa64b5a8da87cb3266a0dc (patch) | |
| tree | 4273854cc5f0253e5970bd1ccc7ff3ac9774c4cc /doc/development/architecture.md | |
| parent | 7780cd6ab1b3dc572ac85660744a315e1cf64f8d (diff) | |
| parent | c489d53b2e2eecb22f8dc7034da142221220e89f (diff) | |
| download | gitlab-ce-11-1-stable-prepare-rc3.tar.gz | |
Merge branch 'master' into 11-1-stable-prepare-rc311-1-stable-prepare-rc3
Diffstat (limited to 'doc/development/architecture.md')
| -rw-r--r-- | doc/development/architecture.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md index 31117b5e723..6ca3e9e5a0a 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -2,7 +2,7 @@ ## Software delivery -There are two software distributions of GitLab: the open source [Community Edition](https://gitlab.com/gitlab-org/gitlab-ce/) (CE), and the open core [Enterprise Edition](https://gitlab.com/gitlab-org/gitlab-ee/) (EE). GitLab is available under [different subscriptions](https://about.gitlab.com/products/). +There are two software distributions of GitLab: the open source [Community Edition](https://gitlab.com/gitlab-org/gitlab-ce/) (CE), and the open core [Enterprise Edition](https://gitlab.com/gitlab-org/gitlab-ee/) (EE). GitLab is available under [different subscriptions](https://about.gitlab.com/pricing/). New versions of GitLab are released in stable branches and the master branch is for bleeding edge development. |