Merge branch '4.0'

Conflicts:
	chrome/content/zotero/xpcom/data/item.js
This commit is contained in:
Dan Stillman 2014-04-26 14:41:53 -04:00
commit a1189fe28e

View file

@ -953,7 +953,7 @@ Zotero.Item.prototype.getDisplayTitle = function (includeAuthorAndDate) {
} else {
var court = this.getField('court');
if (court) {
title = title + ' (' + court + ');
title = title + ' (' + court + ')';
}
}
}