Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

e883aae0 · Marin Jankovski · 225b43de · a66953b1 · e883aae0
Commit e883aae0 authored Apr 20, 2015 by Marin Jankovski
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

CHANGELOG CHANGELOG +1 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 7.11.0 (unreleased)
  -
 v 7.10.0 (unreleased)
+  - Allow projects to be imported from Google Code.
  - Allow users to be invited by email to join a group or project.
  - Don't crash when project repository doesn't exist.
  - Add config var to block auto-created LDAP users.