• Valery Sizov's avatar
    Merge branch 'ce_upstream' into 'master' · 6b028ed8
    Valery Sizov authored
    CE upstream
    
    @dzaporozhets Please resolve these conflicts
    ```
    Unmerged paths:
      (use "git add <file>..." to mark resolution)
    
    	both modified:   app/views/groups/group_members/index.html.haml
    	both modified:   app/views/projects/project_members/index.html.haml
    ```
    
    See merge request !67
    6b028ed8
1_settings.rb 14.9 KB