Skip to content

Commit c67deb2

Browse files
Merge remote-tracking branch 'origin/release'
# Conflicts: # crowdin/lang/af-ZA/messages.json # crowdin/lang/ar-SA/messages.json # crowdin/lang/bg-BG/messages.json # crowdin/lang/ca-ES/messages.json # crowdin/lang/cs-CZ/messages.json # crowdin/lang/da-DK/messages.json # crowdin/lang/de-DE/messages.json # crowdin/lang/el-GR/messages.json # crowdin/lang/en-US/messages.json # crowdin/lang/es-ES/messages.json # crowdin/lang/fi-FI/messages.json # crowdin/lang/fr-FR/messages.json # crowdin/lang/he-IL/messages.json # crowdin/lang/hi-IN/messages.json # crowdin/lang/hu-HU/messages.json # crowdin/lang/it-IT/messages.json # crowdin/lang/ja-JP/messages.json # crowdin/lang/ko-KR/messages.json # crowdin/lang/lt-LT/messages.json # crowdin/lang/nl-NL/messages.json # crowdin/lang/no-NO/messages.json # crowdin/lang/pl-PL/messages.json # crowdin/lang/pt-BR/messages.json # crowdin/lang/pt-PT/messages.json # crowdin/lang/ro-RO/messages.json # crowdin/lang/ru-RU/messages.json # crowdin/lang/sr-SP/messages.json # crowdin/lang/sv-SE/messages.json # crowdin/lang/th-TH/messages.json # crowdin/lang/tr-TR/messages.json # crowdin/lang/uk-UA/messages.json # crowdin/lang/vi-VN/messages.json # crowdin/lang/zh-CN/messages.json # crowdin/lang/zh-HK/messages.json # crowdin/lang/zh-TW/messages.json # pom.xml # src/main/java/org/maxgamer/quickshop/localization/text/distributions/crowdin/CrowdinOTA.java # src/main/java/org/maxgamer/quickshop/util/PlayerFinder.java # src/test/java/org/maxgamer/quickshop/TestBukkitBase.java
2 parents fb312be + 3274bf8 commit c67deb2

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)