larkin 38ad8058e8 Merge remote-tracking branch 'origin/open1223' into open-1338 ...

Resolve merge conflicts due to whitespace changes.

2015-06-29 12:08:16 -07:00

..

CompositionCapability.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

ContextCapability.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

ContextualDomainObject.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

CoreCapabilityProvider.js

[Core] Obey priority for capabilities

2015-06-19 14:40:59 -07:00

DelegationCapability.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

MetadataCapability.js

[Info Bubble] Include type in common metadata

2015-06-04 12:34:56 -07:00

MutationCapability.js

[Core] Add test case for shared listener

2015-06-24 12:12:50 -07:00

PersistenceCapability.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

RelationshipCapability.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00