GitBucket
|
fixed merge conflicts
|
|---|
xsrust
authored
on 1 Sep 2016
|
| app/controllers/api/v0/base_controller.rb |
|---|
| app/models/user.rb |
|---|
| app/views/users/admin_index.html.erb |
|---|
| config/initializers/locale.rb |
|---|