diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-07-04 13:17:54 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-07-04 13:17:54 +0900 |
| commit | f11aa51eeaa7a8175a9075ba95038c675ef9a8a6 (patch) | |
| tree | 922e35c954457ca50d4ed19e8cebe85656cec44a /doc/development/architecture.md | |
| parent | 93a964d449ad29e94e785209d7ecde217a8e9b25 (diff) | |
| parent | 4c1a2a9b9977f68a05512ed1ff378ee0a2368aca (diff) | |
| download | gitlab-ce-f11aa51eeaa7a8175a9075ba95038c675ef9a8a6.tar.gz | |
Merge branch 'master' into build-chunks-on-object-storage
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. |