Merge branch 'feature/RM-3558-recently-modified-marks' into 'master'

Feature/rm 3558 recently modified marks

@Tom can you take a look at this and let me know what you think.

The interesting changes are in the security mark content model.  I've run the builds and they were green with the exception of a couple of seemingly unrelated tests (rerunning that build now to see if it makes any difference)

See merge request !341
This commit is contained in:
Roy Wetherall
2016-07-20 05:58:28 +01:00

2
.gitignore vendored
View File

@@ -36,3 +36,5 @@ test-output
# /rm-enterprise/rm-automation-enterprise/
/rm-enterprise/rm-automation-enterprise/l10n
/rm-enterprise/rm-automation-enterprise/root
rm-automation/src/test/resources/webdriver.properties