Merge branch 'dmpopidor_branding' of https://github.com/OPIDoR/DMPOPIDoR into dmpopidor_branding
dev
commit 66faaabfa6bc98fd0f0c5d140de644b995024649
2 parents 7d2b3db + a718602
@FAURE Benjamin FAURE Benjamin authored on 7 May 2018
Showing 10 changed files
View
app/controllers/api/v0/statistics_controller.rb
View
app/controllers/application_controller.rb
View
app/controllers/contacts_controller.rb
View
app/views/plans/index.html.erb
View
app/views/shared/_access_controls.html.erb
View
lib/assets/javascripts/application.js
View
lib/assets/javascripts/utils/array.js 0 → 100644
View
lib/assets/javascripts/utils/tinymce.js
View
lib/assets/javascripts/views/answers/rda_metadata.js
View
lib/assets/javascripts/views/usage/index.js