David Webster ecbf4d1edc Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

..

audit

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

bootstrap

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

capability

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

dod5015

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

messages

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

model

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

patch

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

query

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

security

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

action-context.xml

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

alfresco-global.properties

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

extended-repository-context.xml

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

log4j.properties

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

module-context.xml

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

module.properties

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

rm-action-context.xml

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

rm-audit-context.xml

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

rm-capabilities-context.xml

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

rm-deprecated-context.xml

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

rm-disposition-properties-context.xml

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

rm-id-context.xml

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

rm-job-context.xml

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

rm-model-context.xml

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

rm-public-services-security-context.xml

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

rm-report-context.xml

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

rm-service-context.xml

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00

rm-ui-evaluators-context.xml

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

rm-webscript-context.xml

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

2016-09-30 15:35:04 +01:00

rm-workflow-context.xml

Let git handle line endings for us.

2016-09-27 13:55:53 +01:00