Skip to content

Commit

Permalink
MERGE: Merge branch '5.3' into 7.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	Neos.Media.Browser/Resources/Private/Translations/ar/Main.xlf
#	Neos.Neos/Resources/Private/Translations/ar/Modules.xlf
#	Neos.Neos/Resources/Private/Translations/cs/Modules.xlf
#	Neos.Neos/Resources/Private/Translations/de/Modules.xlf
#	Neos.Neos/Resources/Private/Translations/lv/Modules.xlf
#	Neos.Neos/Resources/Private/Translations/pl/Modules.xlf
#	Neos.Neos/Resources/Private/Translations/pt/Modules.xlf
#	Neos.Neos/Resources/Private/Translations/ru/Modules.xlf
#	Neos.Neos/Resources/Private/Translations/sr/Modules.xlf
#	Neos.Neos/Resources/Private/Translations/uk/Modules.xlf
  • Loading branch information
kdambekalns committed Nov 22, 2021
2 parents 893238e + 8cab6b2 commit 95bf7d9
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 95bf7d9

Please sign in to comment.