summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-22 20:56:12 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-22 20:56:12 +0300
commitc31c8c55a4b805932ff24e08dc4cdacb497b1a82 (patch)
treef4654ca2c6872015fb1346f5318c9c2d5140e18d /lib
parentfbdf34d7abc678435ab4a603e93dcc83cb89a981 (diff)
parentef6e94e37e0fce23acf32992476aeb63405be0c1 (diff)
downloadgitlab-ce-c31c8c55a4b805932ff24e08dc4cdacb497b1a82.tar.gz
Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/markdown_render.rb
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions