merge fixes (df9625ce) · Commits · WIMMA Lab 2019 / Overflow / ehasa-backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

df9625ce

Commit df9625ce authored 5 years ago by L4168

Downloads
- Patches
- Plain Diff

merge fixes

parent 1217a1d7

No related branches found

No related tags found

2 merge requests!59Development to master,!20Lippuboksi

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/game/coordinate.entity.ts 20 additions, 3 deletions

src/game/coordinate.entity.ts
src/game/faction.entity.ts 5 additions, 13 deletions

src/game/faction.entity.ts
src/game/game.entity.ts 6 additions, 12 deletions

src/game/game.entity.ts
src/game/game.module.ts 2 additions, 0 deletions

src/game/game.module.ts
src/game/game.service.ts 2 additions, 2 deletions

src/game/game.service.ts
src/mapmarkers/mapmarker.entity.ts 19 additions, 22 deletions

src/mapmarkers/mapmarker.entity.ts
src/mapmarkers/mapmarker.service.ts 4 additions, 6 deletions

src/mapmarkers/mapmarker.service.ts
src/notifications/notifications.module.ts 1 addition, 0 deletions

src/notifications/notifications.module.ts
src/shared/roles.controller.ts 88 additions, 0 deletions

src/shared/roles.controller.ts
src/user/user.entity.ts 1 addition, 5 deletions

src/user/user.entity.ts

with 148 additions and 63 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