59f0ed5793
Conflicts: core-js/pom.xml mindplot/pom.xml pom.xml web2d/pom.xml wise-editor/pom.xml wise-webapp/pom.xml |
||
---|---|---|
.. | ||
doc | ||
src | ||
config | ||
pom.xml | ||
webdefault.xml |
59f0ed5793
Conflicts: core-js/pom.xml mindplot/pom.xml pom.xml web2d/pom.xml wise-editor/pom.xml wise-webapp/pom.xml |
||
---|---|---|
.. | ||
doc | ||
src | ||
config | ||
pom.xml | ||
webdefault.xml |