IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3b8cf0a275
DocSpace-buildtools/web/ASC.Web.Editor
History
Tatiana Lopaeva 3b8cf0a275 Merge branch 'develop' into feature/file-folder-selectors 
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/utils.js
#	web/ASC.Web.Editor/src/Editor.jsx
2021-08-19 10:08:14 +03:00
..
public Web: Editor: Added mail merge option. 2021-08-04 11:32:14 +03:00
src Merge branch 'develop' into feature/file-folder-selectors 2021-08-19 10:08:14 +03:00
.babelrc Web: Added new @appserver/editor app 2021-03-05 21:15:48 +03:00
.gitattributes Web: Added new @appserver/editor app 2021-03-05 21:15:48 +03:00
.gitignore Web: Added new @appserver/editor app 2021-03-05 21:15:48 +03:00
Dockerfile Web: Added new @appserver/editor app 2021-03-05 21:15:48 +03:00
jsconfig.json Web: Added new @appserver/editor app 2021-03-05 21:15:48 +03:00
package.json Merge branch 'develop' into bugfix/canShare 2021-08-16 11:07:30 +03:00
webpack.config.js Web: Webpack: increased performance maxEntrypointSize and maxAssetSize 2021-08-11 20:40:31 +03:00