GitBucket
|
resolved cherry-pick conflicts
|
|---|
briley
authored
on 7 Jun 2017
Brian Riley
committed
on 9 Jun 2017
|
| app/controllers/users/omniauth_callbacks_controller.rb |
|---|
| app/models/org.rb |
|---|
| app/models/org_identifier.rb 0 → 100644 |
|---|
| config/application.rb |
|---|
| db/migrate/20170607154433_create_org_identifiers.rb 0 → 100644 |
|---|
| db/schema.rb |
|---|