summaryrefslogtreecommitdiff
path: root/doc/university/README.md
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-06-01 10:31:33 +0200
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-06-01 10:31:33 +0200
commit00b00f1edee71d236b0cd5b796bb68f15142911f (patch)
tree471ef31c0c455abe44f04dcd7d2ba84e87f22be1 /doc/university/README.md
parentf4aa01053ed39a265ddfd9ee6e9618bd3406e59d (diff)
parentdd0f8b8ccc3b5f61e31703f7391a919b702934a5 (diff)
downloadgitlab-ce-00b00f1edee71d236b0cd5b796bb68f15142911f.tar.gz
Merge branch 'master' into zj-realtime-env-list
Diffstat (limited to 'doc/university/README.md')
-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