Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Orbit
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

f80358c2

Verified Commit f80358c2 authored 4 years ago by Gaëlle Morin

Downloads
- Plain Diff

patch: conflict resolved

parents 50f17053 2c05cf1b

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 3 additions, 3 deletions

package-lock.json
package.json 1 addition, 1 deletion

package.json
src/dependencies.pug 14 additions, 1 deletion

src/dependencies.pug
src/views/partials/admin/page-admin-circles.pug 28 additions, 2 deletions

src/views/partials/admin/page-admin-circles.pug
src/views/partials/admin/page-admin-communities.pug 16 additions, 3 deletions

src/views/partials/admin/page-admin-communities.pug
src/views/partials/admin/page-admin-projects.pug 29 additions, 3 deletions

src/views/partials/admin/page-admin-projects.pug

with 91 additions and 13 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 sign in to comment