diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-07-03 15:46:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-03 15:46:23 +0000 |
| commit | f3e95aae7abb68f86fc614d70d0ec4b9683b7bfb (patch) | |
| tree | 8df1a102872fda5e4d9f651e5482f397ab92ca50 /doc/development/architecture.md | |
| parent | f30089075fabfbac45c6382c0a2717bbb682734e (diff) | |
| parent | acc6e3a0fdb8f710d77b8faa2a39823f7e1c7e5d (diff) | |
| download | gitlab-ce-f3e95aae7abb68f86fc614d70d0ec4b9683b7bfb.tar.gz | |
Merge branch 'master' into 'web-hooks-log-pagination'
# Conflicts:
# db/schema.rb
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. |