Merge all commits on develop to master up to commit '440986651c641dc96c1cd9f9d61525ee9435948a'

This makes version 6.7 the same on both branches. Some of the previous versions (6.2-6.6) on
master were missing commits that existed on develop.

Note: 6.7 was released on develop. It should have been done on master, but at least it has
      resulted in the missing commits getting to master.
This commit is contained in:
Alan Davis
2017-10-17 11:07:07 +01:00
parent 8a0c07e0ba
commit 5ac3cc1ac5
164 changed files with 6478 additions and 5710 deletions

4
.gitbugtraq Normal file
View File

@@ -0,0 +1,4 @@
# For SmartGit
[bugtraq "jira"]
url = https://issues.alfresco.com/jira/browse/%BUGID%
logRegex = ([A-Z]+-\\d+)