Merge branch 'master' into add-orcid-functionality
dev
commit 8d4fa3f0a082dae6d49c081b5810904c37409c02
2 parents b6558da + 7af4d09
@briley briley authored on 3 Nov 2016
Showing 1 changed file
View
app/controllers/application_controller.rb