Merge branch 'master' of github.com:gitlabhq/gitlabhq

e9418243 · Dmitriy Zaporozhets · b617455d · 757368f3 · e9418243 · e9418243
Commit e9418243 authored Mar 19, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +1 -1

doc/markdown/markdown.md doc/markdown/markdown.md +1 -1

No files found.
--- 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)

--- 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)