summaryrefslogtreecommitdiff
path: root/lib/api/helpers.rb
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-03-12 09:32:52 -0700
committerMarin Jankovski <maxlazio@gmail.com>2015-03-12 09:32:52 -0700
commitec1c30ceecec9c0c4a1bd3f097e03d57d724e299 (patch)
tree42423222bd84d22db1d4935bf1f4bae9b3c979fd /lib/api/helpers.rb
parentd377e94b35c1af8ab933427e067966101634d6d8 (diff)
parente4dc4390e57efa0b8207d63b4446c019580d00aa (diff)
downloadgitlab-ce-ec1c30ceecec9c0c4a1bd3f097e03d57d724e299.tar.gz
Merge branch 'hover_toggle_sidebar'
Conflicts: app/assets/stylesheets/generic/nav_sidebar.scss
Diffstat (limited to 'lib/api/helpers.rb')
0 files changed, 0 insertions, 0 deletions