Merge branch 'echanges' into beta (a78c54c3) · Commits · Components / custom-tzcld · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

custom-tzcld
- Activity
- Members
- Labels
- Issues
  1
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a78c54c3

Commit a78c54c3 authored 1 year ago by Antoine Dupré

Downloads
- Plain Diff

Merge branch 'echanges' into beta

# Conflicts:
#	src/views-terrytories.js fixed

parents d3a6d887 49e174c8

No related branches found

No related tags found

No related merge requests found

Pipeline #15767 passed with stage

in 1 minute and 38 seconds

Changes 6
Pipelines 2

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/index.js 1 addition, 0 deletions

src/index.js
src/styles/index.scss 14 additions, 0 deletions

src/styles/index.scss
src/styles/shared-notes.scss 132 additions, 0 deletions

src/styles/shared-notes.scss
src/utils.js 6 additions, 0 deletions

src/utils.js
src/views-terrytories.js 420 additions, 42 deletions

src/views-terrytories.js
src/widjets-display-user-tzcld.js 63 additions, 0 deletions

src/widjets-display-user-tzcld.js

with 636 additions and 42 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