Tatiana Lopaeva 36050dd6c9 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 ... # Conflicts: # products/ASC.Files/Client/public/locales/en/Article.json		2021-11-17 15:45:19 +03:00
..
public	Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0	2021-11-17 15:45:19 +03:00
src	Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0	2021-11-17 15:45:19 +03:00
.babelrc	Web: Editor: Optimization	2021-03-06 18:50:06 +03:00
.env	web: files: Fixed proxy configure for images and socketjs	2020-02-26 11:04:26 +03:00
.gitignore
analyse.js	Web: Files: Added Webpack-bundle-analyzer	2020-08-31 12:07:58 +03:00
Dockerfile	Web: Files: init Files build and loading (Moved out from CRA)	2020-12-07 10:49:07 +03:00
package.json	bump version to 1.1.0	2021-11-12 15:19:40 +03:00
webpack.config.js	Web: Moved other common dependencies to sharedDependencies.js	2021-09-13 12:29:44 +03:00