merge

Gemfile

Gemfile.lock

README.md

app/assets/javascripts/admin/notyf.js

app/assets/javascripts/admin/sortable.js

app/assets/javascripts/admin/treeview.js

app/assets/stylesheets/admin/treeview.sass

app/assets/stylesheets/commons/_forms.sass

...controllers/admin/communication/application_controller.rb

...ers/admin/communication/website/application_controller.rb

...lers/admin/communication/website/categories_controller.rb

...ntrollers/admin/communication/website/pages_controller.rb

...ntrollers/admin/communication/website/posts_controller.rb

app/controllers/admin/communication/websites_controller.rb

app/controllers/admin/education/schools_controller.rb

app/controllers/admin/research/application_controller.rb

...trollers/admin/research/journal/application_controller.rb

app/controllers/admin/research/journals_controller.rb

app/controllers/admin/users_controller.rb

app/controllers/concerns/admin/reorderable.rb