peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
pull from: development2
merge into: peet:dev/test
Conversation 1 Commits 431 Files Changed 269 +1 -1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e94ed1e019 - Show all commits

2
Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/StartDialog.java
View File

@@ -255,7 +255,7 @@ public String getName() {
"WutzBär", "WutzBär",
"KnuddelKeks", "KnuddelKeks",
"FantaFlumm", "FantaFlumm",
"ZockerKäse" "ZockerKäse",
"LachHäufchen", "LachHäufchen",
"GurkenGuru", "GurkenGuru",
"PonySchnitzel", "PonySchnitzel",