18b1942169
Conflicts: main/webapp/modules/core/langs/translation-en.json |
||
---|---|---|
.. | ||
.settings | ||
IDEs | ||
src | ||
tests | ||
webapp | ||
.classpath | ||
.gitignore | ||
.project |
18b1942169
Conflicts: main/webapp/modules/core/langs/translation-en.json |
||
---|---|---|
.. | ||
.settings | ||
IDEs | ||
src | ||
tests | ||
webapp | ||
.classpath | ||
.gitignore | ||
.project |