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

Merged

jakub merged 1 commit from lang-manager into master 2024-10-20 08:25:17 +02:00

Conversation 0 Commits 1 Files changed 6 +183 -21

jakub commented 2024-10-20 08:25:08 +02:00

Owner

• Copy link
• Copy Markdown

Conflicts:

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

# Conflicts: # src/main/java/xyz/soukup/mineconomiaCoreV2/MineconomiaCoreV2.java

jakub added 1 commit 2024-10-20 08:25:08 +02:00

Merge remote-tracking branch 'origin/napojeni-database' ... 55566b5e2e

# Conflicts:
#	src/main/java/xyz/soukup/mineconomiaCoreV2/MineconomiaCoreV2.java

jakub merged commit d34b7892fe into master 2024-10-20 08:25:17 +02:00

jakub referenced this pull request from a commit 2024-10-20 08:25:17 +02:00

Merge pull request 'Merge remote-tracking branch 'origin/napojeni-database'' (#14) from lang-manager into master

jakub deleted branch lang-manager 2024-10-20 08:25:22 +02:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

Mineconomia/MineconomiaCoreRedone!14

No description provided.