Skip to content
Snippets Groups Projects
Commit f00c8ede authored by Valery Sizov's avatar Valery Sizov
Browse files

Merge branch 'ce_upstream1' into 'master'

CE upstream

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   app/views/layouts/nav/_admin.html.haml
	both modified:   app/views/layouts/nav/_group_settings.html.haml
	both modified:   doc/README.md

See merge request !501
parents 8fe819da 3a0f447c
No related branches found
No related tags found
1 merge request!501CE upstream
Pipeline #
Showing
with 411 additions and 199 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment