Skip to content

Commit

Permalink
Merge branch 'develop' into ver2.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/deploy.yml
#	EhPanda/App/de.lproj/Localizable.strings
#	EhPanda/App/ja.lproj/Localizable.strings
#	EhPanda/App/ko.lproj/Localizable.strings
#	EhPanda/App/zh-Hans.lproj/Localizable.strings
#	EhPanda/App/zh-Hant.lproj/Localizable.strings
#	EhPanda/Models/EhSetting.swift
#	EhPanda/Models/Models.swift
#	EhPanda/View/Setting/EhPandaView.swift
#	EhPanda/View/Setting/EhSettingView.swift
  • Loading branch information
tatsuz0u committed Feb 7, 2022
2 parents b76591a + 9ff0e70 commit 295351c
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 295351c

Please sign in to comment.