0f3eb1350b
# Conflicts: # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json |
||
---|---|---|
.. | ||
AuthStore.js | ||
index.js | ||
ModuleStore.js | ||
SettingsStore.js | ||
UserStore.js |
0f3eb1350b
# Conflicts: # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json |
||
---|---|---|
.. | ||
AuthStore.js | ||
index.js | ||
ModuleStore.js | ||
SettingsStore.js | ||
UserStore.js |