Merge branch 'master' into asset-settings

This commit is contained in:
Wyatt Johnson
2016-11-28 17:16:39 -07:00
13 changed files with 43 additions and 94 deletions
@@ -127,6 +127,7 @@ describe('itemActions', () => {
'Accept': 'application/json',
'Content-Type':'application/json'
},
credentials: 'same-origin',
body: JSON.stringify(item.data)
}
);