diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-03 17:25:26 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-03 17:25:26 +0000 |
| commit | 1af3f3b673be8f85b37d455b101954e62c2a3add (patch) | |
| tree | 56f09bef2ca41964fae3efaf4f15be7fe1640ba4 /Gemfile.lock | |
| parent | 67c8526033241f6bd190fa16622970b3919e6dbd (diff) | |
| parent | bd8f2b15b3d5267075a626ce86f3a06cc650fcbf (diff) | |
| download | gitlab-ce-1af3f3b673be8f85b37d455b101954e62c2a3add.tar.gz | |
Merge branch 'master' into jej-pages-picked-from-ee
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5736862e5ab..7edc12ba348 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,7 +54,7 @@ GEM faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) asciidoctor (1.5.3) - asciidoctor-plantuml (0.0.6) + asciidoctor-plantuml (0.0.7) asciidoctor (~> 1.5) ast (2.3.0) attr_encrypted (3.0.3) @@ -844,7 +844,7 @@ DEPENDENCIES allocations (~> 1.0) asana (~> 0.4.0) asciidoctor (~> 1.5.2) - asciidoctor-plantuml (= 0.0.6) + asciidoctor-plantuml (= 0.0.7) attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) babosa (~> 1.0.2) |