Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts: app/controllers/admin/users_new_interface_controller.rb
This commit is contained in:
commit
cad03a70d5
Conflicts: app/controllers/admin/users_new_interface_controller.rb