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

@@ -100,14 +100,6 @@ All current source versions are held in github. Historic versions can be found i
Please use [this guide](CONTRIBUTING.md) to make a contribution to the project.
## Setting up your development environment
Although it is possible to work on individual github projects, we recommend working on
the `alfresco-community-repo`, `alfresco-enterprise-repo`, `acs-packaging` and `acs-community-packaging`
in a single Intellij IDEA project. They depend on each other and typically you
will want to make changes to all of them if you are changing the repository code.
In the case of older branches, there is generally no need for the `acs-community-packaging` as you will
not be creating a community release.
Although it is possible to work on individual github projects, we recommend working on the `alfresco-community-repo`
and `acs-community-packaging` in a single Intellij IDEA project. They depend on each other and typically you will
want to make changes to both of them if you are changing the repository code.