Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

W

webapp
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

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

61ed5d77

Commit 61ed5d77 authored 10 years ago by elijah

Downloads
- Plain Diff

Merge branch 'develop' into version/0.6

parents 546a49e3 6e15813d

Branches

No related tags found

No related merge requests found

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

app/controllers/v1/users_controller.rb 1 addition, 1 deletion

app/controllers/v1/users_controller.rb
app/models/account.rb 6 additions, 2 deletions

app/models/account.rb
engines/support/app/models/account_extension/tickets.rb 2 additions, 2 deletions

engines/support/app/models/account_extension/tickets.rb

with 9 additions and 5 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