Merge branch 'master' into feature/ags-reorg

# Conflicts:
#	l10n.properties
This commit is contained in:
alandavis
2021-05-21 09:10:21 +01:00
49 changed files with 2282 additions and 1113 deletions

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>11.35-SNAPSHOT</version>
<version>11.43-SNAPSHOT</version>
</parent>
<properties>