stable

Clone or download

Read-only

Merge commit 'gerrit #5148' into stable/master

* commit '1e642c5': story #8570: Import FRS administrators Change-Id: I04dc0612f75eca36a51263dcb789b7733ff852e1

Modified Files

Name
M src/common/frs/FRSXMLImporter.class.php +21 −1 Go to diff View file
M src/common/project/ProjectXMLImporter.class.php +2 −1 Go to diff View file
M src/common/xml/resources/frs-definition.rnc +6 −1 Go to diff View file
M src/common/xml/resources/project/frs-definition.rng +110 −99 Go to diff View file
M tests/simpletest/common/frs/FRSXMLImporterTest.php +99 −16 Go to diff View file