summaryrefslogtreecommitdiff
path: root/features/steps/snippets/snippets.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-17 11:43:08 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-17 11:43:08 +0200
commit1eb51e17066ce49a4e1e9cb4dd93a25970d166fb (patch)
treebe96ca503cd67bf5ed6e2416004522703815f7ac /features/steps/snippets/snippets.rb
parentb0821a133f3991b563a53cb6b44d8564f258a982 (diff)
parentc39c823421e9dfd3add4cb49a82fa32831797aa0 (diff)
downloadgitlab-ce-1eb51e17066ce49a4e1e9cb4dd93a25970d166fb.tar.gz
Merge branch 'placeholder_text'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: Gemfile.lock
Diffstat (limited to 'features/steps/snippets/snippets.rb')
0 files changed, 0 insertions, 0 deletions