##// END OF EJS Templates
Merge branch 'develop' of...
Merge branch 'develop' of https://perrinel@hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork into develop Conflicts: core/src/Catalogue/CatalogueController.cpp

File last commit:

r359:751f52f38d58
r1315:7185ea8182da merge
Show More
TwoRootsFile.json
3 lines | 46 B | application/json | JsonLexer
Alexandre Leroux
Makes test cases
r359 "data": [
"root1": "root",
"root2": "root"
]