26cdc94f1c
# Conflicts: # products/ASC.Files/Client/src/App.js # products/ASC.People/Client/src/App.js |
||
---|---|---|
.. | ||
ASC.Web.Api | ||
ASC.Web.Client | ||
ASC.Web.Common | ||
ASC.Web.Components | ||
ASC.Web.Core | ||
ASC.Web.Studio |
26cdc94f1c
# Conflicts: # products/ASC.Files/Client/src/App.js # products/ASC.People/Client/src/App.js |
||
---|---|---|
.. | ||
ASC.Web.Api | ||
ASC.Web.Client | ||
ASC.Web.Common | ||
ASC.Web.Components | ||
ASC.Web.Core | ||
ASC.Web.Studio |