Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/oforms gallery #627

Merged
merged 46 commits into from
Apr 21, 2022

Conversation

gopienkonikita
Copy link
Member

No description provided.

gopienkonikita and others added 30 commits March 31, 2022 16:10
# Conflicts:
#	packages/asc-web-common/store/SettingsStore.js
# Conflicts:
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
# Conflicts:
#	packages/asc-web-common/store/SettingsStore.js
#	products/ASC.Files/Client/src/store/FilesStore.js
@AlexeySafronov AlexeySafronov merged commit 742d728 into feature/virtual-rooms-1.2 Apr 21, 2022
@AlexeySafronov AlexeySafronov deleted the feature/oforms-gallery branch April 21, 2022 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants