Alexey Safronov e8eb0db251 Merge branch 'develop' into feature/VDR-room ... # Conflicts: # public/locales/en/Common.json		2024-04-22 15:43:39 +04:00
..
client	Merge branch 'develop' into feature/VDR-room	2024-04-22 15:43:39 +04:00
doceditor	Merge branch 'release/v2.5.0' into develop	2024-04-19 19:10:43 +04:00
login	Merge branch 'release/v2.5.0' into develop	2024-04-19 13:13:00 +04:00
management	Management: Add using system font in management	2024-04-18 12:48:03 +02:00
shared	Merge branch 'develop' into feature/VDR-room	2024-04-22 15:43:39 +04:00