diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-30 19:36:45 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-30 19:36:45 +0300 |
commit | 32d7841b2c15cc795382c2319a041a1102a21e46 (patch) | |
tree | 62433847a56d4d56c891fcaefccaf1ecced88bc3 /lib/api/helpers.rb | |
parent | 86b752e0cfe8c61cc7cc88abc8a129c5229d356c (diff) | |
parent | 39a55bdf1a1613f362bcd7da444b291210454160 (diff) | |
download | gitlab-ce-32d7841b2c15cc795382c2319a041a1102a21e46.tar.gz |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/layouts/_head_panel.html.haml
Diffstat (limited to 'lib/api/helpers.rb')
0 files changed, 0 insertions, 0 deletions