Commit Graph

6 Commits

Author SHA1 Message Date
45d2a31d03 Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
#	public/locales/de/Common.json
2022-04-04 19:34:51 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
3bbf82d918 add new lines 2022-03-09 19:07:24 +03:00
32c398c044 Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
b5eeac9a47 edit translations 2021-12-14 12:43:10 +03:00
af2e95dfd7 edit cs 2021-12-06 11:28:11 +03:00