55198d0e7f
# Conflicts: # web/ASC.Web.Editor/src/i18n.js # web/ASC.Web.Editor/webpack.config.js # yarn.lock |
||
---|---|---|
.. | ||
public | ||
src | ||
webpack | ||
.babelrc | ||
.gitattributes | ||
.gitignore | ||
Dockerfile | ||
jsconfig.json | ||
package.json |
55198d0e7f
# Conflicts: # web/ASC.Web.Editor/src/i18n.js # web/ASC.Web.Editor/webpack.config.js # yarn.lock |
||
---|---|---|
.. | ||
public | ||
src | ||
webpack | ||
.babelrc | ||
.gitattributes | ||
.gitignore | ||
Dockerfile | ||
jsconfig.json | ||
package.json |