##// 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:

r352:b2a47c61d04d
r1315:7185ea8182da merge
Show More
amda.json
3 lines | 24 B | application/json | JsonLexer
{
"name" : "Amda"
}