Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
website
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
live-edu
website
Commits
d35cc180
Commit
d35cc180
authored
9 years ago
by
Ján Švantner
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into 'master'
Develop to master See merge request
!118
parents
8adcf732
9b45f937
Branches
Branches containing commit
Tags
v2.5.2
1 merge request
!118
Develop to master
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/modules/api/controllers/User.java
+38
-31
38 additions, 31 deletions
app/modules/api/controllers/User.java
app/services/UserRegister.java
+2
-2
2 additions, 2 deletions
app/services/UserRegister.java
build.sbt
+1
-1
1 addition, 1 deletion
build.sbt
with
41 additions
and
34 deletions
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
