gopienkonikita bcbefb8f26 Merge branch 'feature/files' into feature/selectors-refactoring ... # Conflicts: # products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js # products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js # products/ASC.Files/Client/src/components/pages/Settings/index.js # products/ASC.Files/Client/src/store/files/actions.js # products/ASC.Files/Client/src/store/files/reducers.js # products/ASC.Files/Client/src/store/files/selectors.js		2020-10-13 15:08:22 +03:00
..
Client	Merge branch 'feature/files' into feature/selectors-refactoring	2020-10-13 15:08:22 +03:00
Core	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00
Server	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00
Service	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00