summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSid Sijbrandij <sytse@gitlab.com>2017-05-31 22:27:59 +0000
committerSid Sijbrandij <sytse@gitlab.com>2017-05-31 22:27:59 +0000
commitdd0f8b8ccc3b5f61e31703f7391a919b702934a5 (patch)
treeebcf1c797f253a46cb3f2de9b463a49c7d3b1f0c /doc
parentdddb1722005b06e46d9065d31e10090c986a3cf3 (diff)
parentc3dd2d1117743cff15181caf1b12e35daa31a33f (diff)
downloadgitlab-ce-dd0f8b8ccc3b5f61e31703f7391a919b702934a5.tar.gz
Merge branch 'patch-23' into 'master'
Add GitLab Resources to University See merge request !11832
Diffstat (limited to 'doc')
-rw-r--r--doc/university/README.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/university/README.md b/doc/university/README.md
index c1661f0b52b..399d54bcf23 100644
--- a/doc/university/README.md
+++ b/doc/university/README.md
@@ -65,6 +65,7 @@ The curriculum is composed of GitLab videos, screencasts, presentations, project
1. [Using Innersourcing to Improve Collaboration](https://about.gitlab.com/2014/09/05/innersourcing-using-the-open-source-workflow-to-improve-collaboration-within-an-organization/)
1. [The Software Development Market and GitLab - Video](https://www.youtube.com/watch?v=sXlhgPK1NTY&list=PLFGfElNsQthbQu_IWlNOxul0TbS_2JH-e&index=6) - [Slides](https://docs.google.com/presentation/d/1vCU-NbZWz8NTNK8Vu3y4zGMAHb5DpC8PE5mHtw1PWfI/edit)
1. [The GitLab Book Club](bookclub/index.md)
+1. [GitLab Resources](https://about.gitlab.com/resources/)
#### 1.7 Community and Support