Merge branch '4.0'

This commit is contained in:
Dan Stillman 2016-05-07 13:27:56 -04:00
commit 216900094b
4 changed files with 4 additions and 4 deletions

View file

@ -176,7 +176,7 @@ var Zotero_CSL_Editor = new function() {
throw e;
}
var itemIds = [items[i].id for (i in items)];
var itemIds = items.map(item => item.id);
styleEngine.updateItems(itemIds);

View file

@ -1 +1 @@
2016-04-12 04:26:00
2016-04-27 15:10:00

2
styles

@ -1 +1 @@
Subproject commit 2a33b37ec422fa00f2a860d906120357f23574a0
Subproject commit a154cf5d27d61b137ce41a663b53c92c936e2441

@ -1 +1 @@
Subproject commit f0aa00219aeb75f04654a59339aa94e1accbc956
Subproject commit 155dfa3555e522fd991f5095c19dbe5460b74662