Skip to content
Snippets Groups Projects

CE upstream - 2018-06-06 15:12 UTC

Merged 🤖 GitLab Bot 🤖 requested to merge ce-to-ee-2018-06-06 into master
+ 0
5
@@ -3,10 +3,5 @@
mount GraphiQL::Rails::Engine, at: '/-/graphql-explorer', graphql_path: '/api/graphql'
end
<<<<<<< HEAD
::API::API.logger Rails.logger
mount ::API::API => '/'
=======
API::API.logger Rails.logger
mount API::API => '/'
>>>>>>> upstream/master
Loading