Commit ad3ee493 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 630efe48 04956155
......@@ -110,3 +110,5 @@ 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