summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-05-17 22:17:20 +0000
committerStan Hu <stanhu@gmail.com>2018-05-17 22:17:20 +0000
commitd3adee5105d4c7745b03ad23999d20fd42b3c575 (patch)
treeb1a67f0dfec96ab4ada3e5363317ce408269e46b /README.md
parentf214efb87bd345490277b9962b43752c095c0b2c (diff)
parentd6c8a55189d62430c7ca4ffa6e5bb63f15a7efc1 (diff)
downloadgitlab-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 'README.md')
-rw-r--r--README.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/README.md b/README.md
index 9c1aad65307..013cac75c46 100644
--- a/README.md
+++ b/README.md
@@ -73,6 +73,8 @@ GitLab Community Edition (CE) is available freely under the MIT Expat license.
All third party components incorporated into the GitLab Software are licensed under the original license provided by the owner of the applicable component.
+All Documentation content that resides under the doc/ directory of this repository is licensed under Creative Commons: CC BY-SA 4.0.
+
## Install a development environment
To work on GitLab itself, we recommend setting up your development environment with [the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit).