Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

plugin
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

3c3ad9bf

Commit 3c3ad9bf authored 4 years ago by Mhaned Oubounyt

Downloads
- Plain Diff

Merge branch 'master' into 'selection'

# Conflicts:
#   src/app/pages/explorer-page/explorer-page.component.ts

parents 57a56d34 b7316203

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 0 additions, 10 deletions

.gitlab-ci.yml
angular.json 1 addition, 1 deletion

angular.json
src/app/pages/explorer-page/explorer-page.component.html 2 additions, 2 deletions

src/app/pages/explorer-page/explorer-page.component.html
src/app/pages/explorer-page/explorer-page.component.ts 38 additions, 28 deletions

src/app/pages/explorer-page/explorer-page.component.ts
src/main.ts 1 addition, 0 deletions

src/main.ts
tslint.json 2 additions, 9 deletions

tslint.json

with 44 additions and 50 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