BTCPrivate
/
batm_public
mirror of https://github.com/BTCPrivate/batm_public.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into BPUB-576-myr-currency-support

This commit is contained in:
rpanak-generalbytes 2018-05-28 14:29:08 +02:00 committed by GitHub
parent d251f0e5c9 c09defd504
commit c347abd508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -12,4 +12,4 @@ install-libs.sh
..gitignore.swp
.project
.classpath
.settings/
.settings/

2
server_extensions_api/build.gradle
View File

@ -44,4 +44,4 @@ if (hasProperty('gbArtifactoryUser') && hasProperty('gbArtifactoryPassword') &&
}
}
}
}
}

2
server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Country.java
View File

@ -141,7 +141,7 @@ public enum Country {
LT("LT", "LTU", "Lithuania"),
LU("LU", "LUX", "Luxembourg"),
MO("MO", "MAC", "Macao"),
MK("MK", "MKD", "Macedonia (the former Yugoslav Republic of)"),
MK("MK", "MKD", "Macedonia"),
MG("MG", "MDG", "Madagascar"),
MW("MW", "MWI", "Malawi"),
MY("MY", "MYS", "Malaysia"),

2
server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Currencies.java
View File

@ -57,6 +57,7 @@ public class Currencies {
public static final String GBP = "GBP";
public static final String HUF = "HUF";
public static final String JPY = "JPY";
public static final String MKD = "MKD";
public static final String MYR = "MYR";
public static final String SGD = "SGD";
public static final String USD = "USD";
@ -104,6 +105,7 @@ public class Currencies {
fiat.add(GBP);
fiat.add(HUF);
fiat.add(JPY);
fiat.add(MKD);
fiat.add(MYR);
fiat.add(SGD);
fiat.add(USD);