Merge branch 'master' into 'feature/entrepreneur-dashboard-detail' (4d92fc3a) · Commits · Applications / Knowledge Base / knowledgebase-front · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

knowledgebase-front
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

4d92fc3a

Commit 4d92fc3a authored 5 years ago by Alice Poggioli

Downloads
- Plain Diff

Merge branch 'master' into 'feature/entrepreneur-dashboard-detail'

# Conflicts:
#   src/includes/entrepreneur/resources/list.pug

parents 4eed37e5 edb77e2a

No related branches found

No related tags found

Loading

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/includes/components/widgets.pug 5 additions, 2 deletions

src/includes/components/widgets.pug
src/includes/entrepreneur/resources/list.pug 278 additions, 273 deletions

src/includes/entrepreneur/resources/list.pug
src/includes/mentor/components/header.pug 10 additions, 1 deletion

src/includes/mentor/components/header.pug
src/includes/mentor/resources/detail.pug 1 addition, 1 deletion

src/includes/mentor/resources/detail.pug
src/scripts/coopstarter.js 1 addition, 1 deletion

src/scripts/coopstarter.js
src/styles/index.scss 144 additions, 9 deletions

src/styles/index.scss

with 439 additions and 287 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