Merge remote-tracking branch 'origin/master' into persist-on-mutation-825

2016-10-07 11:27:58 -07:00
parent 385d90b056 cbd001e280
commit 1a88c9a651
314 changed files with 6153 additions and 7464 deletions
--- a/platform/commonUI/edit/test/representers/EditRepresenterSpec.js
+++ b/platform/commonUI/edit/test/representers/EditRepresenterSpec.js
@@ -105,7 +105,7 @@ define(
                );

                // Finally, check that the provided mutation function
-                // includes both model and configuratioon
+                // includes both model and configuration
                expect(
                    mockDomainObject.useCapability.mostRecentCall.args[1]()
                ).toEqual({