Merge remote-tracking branch 'origin/napojeni-database' #14

Merged
jakub merged 1 commits from lang-manager into master 1 year ago
jakub commented 1 year ago
Owner

Conflicts:

src/main/java/xyz/soukup/mineconomiaCoreV2/MineconomiaCoreV2.java

# Conflicts: # src/main/java/xyz/soukup/mineconomiaCoreV2/MineconomiaCoreV2.java
jakub added 1 commit 1 year ago
55566b5e2e Merge remote-tracking branch 'origin/napojeni-database'
jakub merged commit d34b7892fe into master 1 year ago
jakub deleted branch lang-manager 1 year ago
The pull request has been merged as d34b7892fe.
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
1 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Mineconomia/MineconomiaCoreRedone#14
Loading…
There is no content yet.