Tatiana Lopaeva 7b623c4e30 Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js # packages/client/src/pages/PortalSettings/utils/settingsTree.js # packages/common/store/AuthStore.js # packages/components/slider/index.js # web/ASC.Web.Api/Api/Settings/SettingsController.cs		2022-09-05 10:19:52 +03:00
..
files	Merge branch 'develop' into feature/create-room	2022-08-29 17:15:20 +03:00
groups	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
modules	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
oforms	Web: Common: added oforms filter	2022-08-29 11:28:05 +03:00
people	Web:Common:Api: delete useless code	2022-08-30 11:57:06 +03:00
plugins	Web:Common:Api: add 'request' func to plugins api	2022-08-24 19:53:33 +03:00
portal	Web: Added functionality for the expired period.	2022-09-01 17:28:08 +03:00
rooms	removed for-dev console.log	2022-08-25 18:16:03 +03:00
settings	Merge branch 'develop' into feature/stripe	2022-09-05 10:19:52 +03:00
user	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
client.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
index.js	Web: Common: added oforms filter	2022-08-29 11:28:05 +03:00