Reolve conflicts
Signed-off-by: 
Rémy Coutable <remy@rymai.me>
显示
- LICENSE 0 个添加, 4 个删除LICENSE
- app/controllers/projects/protected_branches_controller.rb 0 个添加, 7 个删除app/controllers/projects/protected_branches_controller.rb
- app/views/search/results/_blob.html.haml 0 个添加, 5 个删除app/views/search/results/_blob.html.haml
- spec/requests/api/groups_spec.rb 13 个添加, 16 个删除spec/requests/api/groups_spec.rb
加载中
想要评论请 注册 或 登录