Commit f57f585c authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 26311afe 97c7b9e8
......@@ -110,5 +110,3 @@ module API
end
end
end
API::Todos.prepend_if_ee('EE::API::Todos')
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment