Merge branch 'group-fix' into HEAD (ee29e3c6) · 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

ee29e3c6

Commit ee29e3c6 authored 5 years ago by Samuli Virtapohja

Downloads
- Plain Diff

Merge branch 'group-fix' into HEAD

parents 506079bd 79e8dcfd

No related branches found

No related tags found

3 merge requests!59Development to master,!31Development,!28Group fix

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/faction/faction.controller.ts 25 additions, 10 deletions

src/faction/faction.controller.ts
src/faction/faction.dto.ts 8 additions, 0 deletions

src/faction/faction.dto.ts
src/faction/faction.entity.ts 9 additions, 4 deletions

src/faction/faction.entity.ts
src/faction/faction.service.ts 29 additions, 32 deletions

src/faction/faction.service.ts
src/game/game.controller.ts 4 additions, 0 deletions

src/game/game.controller.ts
src/game/game.entity.ts 5 additions, 4 deletions

src/game/game.entity.ts
src/game/game.service.ts 4 additions, 0 deletions

src/game/game.service.ts
src/task/task.service.ts 0 additions, 1 deletion

src/task/task.service.ts
src/user/user.entity.ts 5 additions, 7 deletions

src/user/user.entity.ts

with 89 additions and 58 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