Viktor Fomin
32868de412
# Conflicts: # packages/asc-web-common/api/settings/index.js # public/locales/de/Common.json |
||
---|---|---|
.. | ||
files | ||
groups | ||
modules | ||
people | ||
portal | ||
settings | ||
user | ||
client.js | ||
index.js |
Viktor Fomin
32868de412
# Conflicts: # packages/asc-web-common/api/settings/index.js # public/locales/de/Common.json |
||
---|---|---|
.. | ||
files | ||
groups | ||
modules | ||
people | ||
portal | ||
settings | ||
user | ||
client.js | ||
index.js |