GitBucket
|
fixed merge conflicts from pulling in latest bug fixes from development
|
|---|
briley
authored
on 6 Sep 2017
|
| app/controllers/roles_controller.rb |
|---|
| app/models/settings/template.rb |
|---|
| app/models/user.rb |
|---|
| db/migrate/20170702012742_ensure_indexes_in_place.rb |
|---|
| db/seeds.rb |
|---|
| lib/tasks/bugfix.rake 0 → 100644 |
|---|
| test/functional/roles_controller_test.rb |
|---|