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

Gemfile

Gemfile.lock

app/assets/stylesheets/admin/appstack.sass

app/controllers/admin/communication/websites_controller.rb

app/helpers/admin/application_helper.rb

app/models/communication/website/imported/page.rb

app/models/communication/website/imported/post.rb

app/views/admin/application/_top.html.erb

app/views/admin/communication/websites/import.html.erb

app/views/admin/dashboard/index.html.erb

app/views/devise/registrations/edit.html.erb

app/views/devise/two_factor_authentication/show.html.erb

app/views/server/dashboard/index.html.erb

app/views/server/languages/index.html.erb

app/views/server/layouts/application.html.erb

app/views/server/universities/_form.html.erb

app/views/server/universities/index.html.erb

app/views/server/universities/show.html.erb

config/locales/en.yml

config/locales/fr.yml