diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-19 08:37:56 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-19 08:37:56 -0700 |
| commit | e94182434cbd8277f3cda4a84ee86745814c8c26 (patch) | |
| tree | b8746fdb8cbf0610537a779c52bdf157faff8658 | |
| parent | b617455d2d6fe1e0ae26dec4a8db7612cdd1320a (diff) | |
| parent | 757368f3adb0aa1a81b15defcb3e631c376b939f (diff) | |
| download | gitlab-ce-e94182434cbd8277f3cda4a84ee86745814c8c26.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | doc/markdown/markdown.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a454461ec26..71936584d6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -519,7 +519,7 @@ GEM rubyntlm (0.5.0) rubypants (0.2.0) rugged (0.21.4) - rugments (1.0.0.beta4) + rugments (1.0.0.beta5) safe_yaml (0.9.7) sanitize (2.1.0) nokogiri (>= 1.4.4) diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md index 64f28d46451..b66583bb363 100644 --- a/doc/markdown/markdown.md +++ b/doc/markdown/markdown.md @@ -6,7 +6,7 @@ * [Newlines](#newlines) * [Multiple underscores in words](#multiple-underscores-in-words) -* [URL auto-linking](#url-autolinking) +* [URL auto-linking](#url-auto-linking) * [Code and Syntax Highlighting](#code-and-syntax-highlighting) * [Emoji](#emoji) * [Special GitLab references](#special-gitlab-references) |