diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-11 20:32:21 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-11 20:32:21 +0200 |
| commit | c61512d4e18a873df229ba2fddb28dfddc423009 (patch) | |
| tree | 06c847304eb50e7720e169a27d40048f49b4c362 /app/views/help | |
| parent | 6e47fbf5d9432c065199322a47bc465fccf9a132 (diff) | |
| parent | 61748c993de8a38300c0c038cec5a07e6c324cd6 (diff) | |
| download | gitlab-ce-c61512d4e18a873df229ba2fddb28dfddc423009.tar.gz | |
Merge branch 'header-anchors' of github.com:cirosantilli/gitlab-elearn into cirosantilli-header-anchors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
Diffstat (limited to 'app/views/help')
| -rw-r--r-- | app/views/help/_layout.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/help/_layout.html.haml b/app/views/help/_layout.html.haml index a413616bad0..201d63ca243 100644 --- a/app/views/help/_layout.html.haml +++ b/app/views/help/_layout.html.haml @@ -8,4 +8,5 @@ = link_to title, path .col-md-9 - = yield + .wiki + = yield |