Shawn Pearce ebfff02c75 Merge branch 'stable-2.7' into stable-2.8 ...

* stable-2.7:
  Catch missing LDAP accounts in group membership
  Update patch status before skipping duplicate emails

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java

Change-Id: I94db0700e753eef5e94077f2ba0303b78708315b

2013-11-18 08:41:25 -08:00

..

.settings

Add encoding for generated-sources/prolog-java in Eclipse prefs

2013-05-07 10:43:00 +01:00

src

Merge branch 'stable-2.7' into stable-2.8

2013-11-18 08:41:25 -08:00

.gitignore

Add Intellij IDEA files to ignore list

2012-05-03 13:17:43 -07:00

BUCK

Use a fake MillisProvider in AbstractQueryChangesTest

2013-10-16 10:10:56 -07:00