diff options
author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-04-08 10:29:41 +0000 |
---|---|---|
committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-04-08 10:29:41 +0000 |
commit | 862e0e34d34213097e1a178c280c2ce2f273f322 (patch) | |
tree | bdef3c0ad9be12dcba44e21d4460cd42603a19af | |
parent | e7087fbfc4146d52fdac8a73e6c3157c3aa57cfa (diff) | |
parent | 76ca5976de41722c2cdaa0aa1d31c3c2c7bbbb9f (diff) | |
download | gitlab-ce-862e0e34d34213097e1a178c280c2ce2f273f322.tar.gz |
Merge branch 'remove-nested-dir-in-docs' into 'master'
Remove nested dir in docs
Needed for https://gitlab.com/gitlab-com/doc-gitlab-com/issues/1
/cc @dzaporozhets
-rw-r--r-- | doc/development/gitlab_diagram_overview.odg (renamed from doc/development/resources/gitlab_diagram_overview.odg) | bin | 26292 -> 26292 bytes |
-rw-r--r-- | doc/development/gitlab_diagram_overview.png (renamed from doc/development/resources/gitlab_diagram_overview.png) | bin | 130285 -> 130285 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/doc/development/resources/gitlab_diagram_overview.odg b/doc/development/gitlab_diagram_overview.odg Binary files differindex b7e02f8fa78..b7e02f8fa78 100644 --- a/doc/development/resources/gitlab_diagram_overview.odg +++ b/doc/development/gitlab_diagram_overview.odg diff --git a/doc/development/resources/gitlab_diagram_overview.png b/doc/development/gitlab_diagram_overview.png Binary files differindex b5831cf0a4c..b5831cf0a4c 100644 --- a/doc/development/resources/gitlab_diagram_overview.png +++ b/doc/development/gitlab_diagram_overview.png |