diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-17 11:43:08 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-17 11:43:08 +0200 |
| commit | 1eb51e17066ce49a4e1e9cb4dd93a25970d166fb (patch) | |
| tree | be96ca503cd67bf5ed6e2416004522703815f7ac /Gemfile.lock | |
| parent | b0821a133f3991b563a53cb6b44d8564f258a982 (diff) | |
| parent | c39c823421e9dfd3add4cb49a82fa32831797aa0 (diff) | |
| download | gitlab-ce-1eb51e17066ce49a4e1e9cb4dd93a25970d166fb.tar.gz | |
Merge branch 'placeholder_text'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9d294485151..0640c14d343 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -855,6 +855,3 @@ DEPENDENCIES virtus webmock (~> 1.21.0) wikicloth (= 0.8.1) - -BUNDLED WITH - 1.10.4 |