Merge branch 'master' of github.com:noesya/osuny

Gemfile

Gemfile.lock

...lers/admin/university/organizations/imports_controller.rb

app/models/import.rb

app/models/university.rb

app/models/university/with_people_and_organizations.rb

...ervices/filters/admin/university/organizations/imports.rb

app/services/importers/base.rb

app/services/importers/organizations.rb

app/views/admin/imports/_list.html.erb

app/views/admin/imports/show.html.erb

app/views/admin/university/alumni/index.html.erb

...ews/admin/university/organizations/imports/index.html.erb

...views/admin/university/organizations/imports/new.html.erb

...iews/admin/university/organizations/imports/show.html.erb

app/views/admin/university/organizations/index.html.erb

config/initializers/delayed_jobs.rb

config/locales/en.yml

config/locales/fr.yml

config/locales/university/en.yml