Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Progark gruppe 3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tobias Ingebrigt Ørstad
Progark gruppe 3
Commits
707bc27f
Commit
707bc27f
authored
5 years ago
by
Turid Cecilie Dahl
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/dev' into 97-last-day-changes
parents
edef33e7
88523cc7
No related branches found
No related tags found
2 merge requests
!104
Dev
,
!100
Resolve "Last day changes"
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
backend/api/rounds.js
+1
-1
1 addition, 1 deletion
backend/api/rounds.js
backend/api/tournament.js
+40
-0
40 additions, 0 deletions
backend/api/tournament.js
frontend/core/src/com/gameware/game/QueryIntermediate.java
+9
-0
9 additions, 0 deletions
frontend/core/src/com/gameware/game/QueryIntermediate.java
with
50 additions
and
1 deletion
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
