Commit Graph

3 Commits

Author SHA1 Message Date
bniwredyc
a305da39fc Merge remote-tracking branch 'gitlab/dev' into editor
# Conflicts:
#	public/locales/en/translation.json
#	public/locales/ru/translation.json
#	src/components/Article/FullArticle.tsx
2023-03-23 18:54:33 +01:00
bniwredyc
32b53ae5cb Merge branch 'editor' of gitlab.com:discoursio/discoursio-webapp into editor
# Conflicts:
#	src/components/Editor/Editor.tsx
2023-03-23 18:47:36 +01:00
bniwredyc
73f9013dc0 topic selector WIP 2023-03-23 18:15:50 +01:00