diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-26 11:13:42 +0000 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-26 11:13:42 +0000 |
commit | ca6cc6014eed02b2e74bc8ffe65d3c1cc2e511b4 (patch) | |
tree | 2c7f9b643463a69b5010b8942eaa2e3c58fd59c9 /doc/development/README.md | |
parent | af6e3e57e4c0ee861e26310c65be2e5e8547ca68 (diff) | |
parent | 52bd4b88dc557f0b3c63e82d0f2093f22b28ae9d (diff) | |
download | gitlab-ce-ca6cc6014eed02b2e74bc8ffe65d3c1cc2e511b4.tar.gz |
Merge branch 'master' into 'add-sentry-js-again-with-vue'
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'doc/development/README.md')
-rw-r--r-- | doc/development/README.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/development/README.md b/doc/development/README.md index 3c797505aa9..77bb0263374 100644 --- a/doc/development/README.md +++ b/doc/development/README.md @@ -33,7 +33,6 @@ ## Backend howtos - [Architecture](architecture.md) of GitLab -- [CI setup](ci_setup.md) for testing GitLab - [Gotchas](gotchas.md) to avoid - [How to dump production data to staging](db_dump.md) - [Instrumentation](instrumentation.md) |