291 Commits

Author	SHA1	Message	Date
Christoph Atteneder	21e29e3ed5	Merge pull request #2353 from heliumchain/list-helium-asset ... List Helium (HLM)	2019-02-27 12:49:47 +01:00
Christoph Atteneder	aac7e93cd7	Merge pull request #2326 from CloakProject/master ... List CloakCoin (CLOAK)	2019-02-27 12:49:33 +01:00
sennevb	6d3328dba2	List Bitzec (BZC)	2019-02-27 12:21:48 +01:00
Dave Long	59c6f671d5	List Plenteum (PLE)	2019-02-25 19:47:23 +02:00
Mr QWC	4500769f89	List Qwertycoin (QWC) ... Official project URL: https://qwertycoin.org Official block explorer URL: https://explorer.qwertycoin.org Included is a pop up message to let QWC senders know what is required of them in the event a trade goes to arbitration.	2019-02-23 23:44:56 +01:00
quantum13	1437a5bec8	List XDR (XDR)	2019-02-21 19:48:46 +03:00
Nico Krause	2c863b357c	List Doichain (DOI)	2019-02-21 09:49:56 +08:00
Manfred Karrer	ba37096ccf	Add LitecoinZ as it was a newly added coin.	2019-02-18 22:24:52 -05:00
Anorak Tha Great	54073030f4	List CloakCoin (CLOAK)	2019-02-18 10:38:59 -07:00
Manfred Karrer	59920bb994	Remove not traded assets ... - Remove Gridcoin, LitecoinZ and ZeroOneCoin - Update getMainCryptoCurrencies and getRemovedCryptoCurrencies methods - Update isWarmingUp method Insufficiently traded assets: Gridcoin (GRC): Trade amount: 0.0055 BTC, number of trades: 1 Not traded assets: 01coin (ZOC) LitecoinZ (LTZ)	2019-02-18 12:06:21 -05:00
Krestien	85971f8703	List DSTRA (DST)	2019-02-18 14:12:34 +01:00
WG91	fdb966ca2f	Add MirQuiX ... Create MirQuiXTest.java Create MirQuiX.java Update MirQuiX.java	2019-02-18 08:39:50 +01:00
Manfred Karrer	c619860d4d	Add info popup for BEAM accounts. Improve GRIN info popup text.	2019-02-15 13:20:01 -05:00
Manfred Karrer	83d942677c	Fix typos	2019-02-15 00:02:03 -05:00
xiphon	75293fbc91	Implement correct and complete Monero and Cryptonote address validator	2019-02-15 02:56:42 +00:00
Christoph Atteneder	3a39e22917	List USD Coin (USDC)	2019-02-08 17:41:18 +01:00
Christoph Atteneder	99398a6b8e	List TrueUSD (TUSD)	2019-02-08 17:40:26 +01:00
Christoph Atteneder	dcc6d0ebb2	List Dai Stablecoin (DAI)	2019-02-08 17:37:18 +01:00
Christoph Atteneder	f4bf209960	Merge pull request #2382 from lichuan/list-askcoin-asset ... List Askcoin (ASK)	2019-02-07 14:54:32 +01:00
LitecoinZ	be257da259	List LitecoinZ (LTZ)	2019-02-07 11:47:49 +01:00
Christoph Atteneder	edabca6ac5	Merge pull request #2289 from imnotarobot0x/list-Credits ... List Credits (CRDS)	2019-02-07 09:24:10 +01:00
Christoph Atteneder	a3fa68bcd6	Merge pull request #2309 from bitdaric/list-bitdaric-asset2 ... List BitDaric [DARX]	2019-02-07 09:23:57 +01:00
Christoph Atteneder	9703bf5af1	Merge pull request #2319 from aphivantrakul/list-cash2-asset ... List Cash2 (CASH2)	2019-02-07 09:23:28 +01:00
Christoph Atteneder	0c93ea93a4	Merge pull request #2321 from LytixChain/master ... List Lytix (LYTX)	2019-02-07 09:23:14 +01:00
Christoph Atteneder	4cdc933360	Merge pull request #2322 from adeptio-project/list-adeptio-asset ... List Adeptio (ADE)	2019-02-07 09:23:00 +01:00
Christoph Atteneder	1d05d426db	Merge pull request #2341 from w07wong/list-vectorspaceai ... List VectorspaceAI (VXV)	2019-02-07 09:22:34 +01:00
Christoph Atteneder	2751c3b2d0	Merge pull request #2359 from cryptocrowdclub/master ... List CRowdCLassic (CRCL)	2019-02-07 09:22:08 +01:00
lichuan	38fcdf7866	List Askcoin (ASK)	2019-02-07 14:53:56 +08:00
Manfred Karrer	67b255562f	Merge pull request #2368 from oscarguindzberg/remove-libdohj ... Remove libdohj dependency	2019-02-05 13:49:07 +01:00
Oscar Guindzberg	52e36187d1	Remove libdohj dependency	2019-02-05 09:33:58 -03:00
Christoph Atteneder	7d94cb6d05	Merge pull request #2345 from Augmint/augmint ... List Augmint Euro (AEUR)	2019-02-05 11:11:41 +01:00
Viktor Szathmáry	825103b484	List Augmint Euro (AEUR)	2019-02-05 11:02:39 +01:00
cryptocrowdclub	434a727c88	List CRowdCLassic (CRCL)	2019-02-03 15:43:03 +02:00
Manfred Karrer	c11ec1399a	Remove support for IP:port Grin address format. ... Add popup with info for proof tool	2019-02-03 01:46:45 +01:00
TeelaBrown	7dda725822	List Helium (HLM)	2019-02-02 20:47:21 +02:00
Vectorspace AI	9030d72088	List VectorspaceAI (VXV)	2019-01-29 22:51:04 -08:00
Thomas Janshon	77ea660092	List Adeptio (ADE)	2019-01-26 16:49:21 +02:00
faetos	4f528c7336	List Lytix (LYTX)	2019-01-25 19:21:07 -06:00
Paul Aphivantrakul	8f41df0b30	List Cash2 (CASH2) ... Official project URL: https://cash2.org Official block explorer URL: https://blocks.cash2.org Included is a pop up message to let CASH2 senders know what is required of them in the event a trade goes to arbitration.	2019-01-24 14:33:07 -05:00
Christoph Atteneder	ccd7a3f1b2	Merge pull request #2273 from cypheron/list-ZelCash ... List ZelCash (ZEL)	2019-01-24 15:04:11 +01:00
BitDaric	4d049cafa4	List BitDaric [DARX] ... BitDaric (DARX)	2019-01-23 13:12:43 +03:30
quantum13	4b349864a0	List Mile (MILE)	2019-01-22 13:43:41 +03:00
imnotarobot0x	a12244c7fc	List Credits (CRDS)	2019-01-18 22:18:07 +00:00
cypheron	c8863e8e7e	List ZelCash (ZEL)	2019-01-16 02:57:11 +01:00
motty	7ada455b99	List Fujicoin (FJC)	2019-01-15 17:49:46 +09:00
Christoph Atteneder	ce988eb767	Fix wrong alphabetical order	2019-01-11 15:03:08 +01:00
Christoph Atteneder	493592b8c9	Merge pull request #2238 from nezero/master ... List DeepOnion (ONION)	2019-01-11 14:54:17 +01:00
Liam Alford	74e4f9027c	List DeepOnion (ONION) ... Official project URL: https://deeponion.org/ Official block explorer URL: https://explorer.deeponion.org/	2019-01-11 13:41:38 +00:00
Christoph Atteneder	d8cdd5a24a	Merge pull request #2228 from remus-persona/list-persona-asset ... List Persona (PRSN)	2019-01-11 14:13:38 +01:00
Christoph Atteneder	0a25fbcc96	Merge pull request #2236 from farsider350/AustraliaCash-AUS ... List AustraliaCash (AUS)	2019-01-11 14:12:52 +01:00
Bernard Labno	9a85e67d48	Sort assets	2019-01-11 13:17:21 +01:00
Jason-farsider350	151d08015e	List AustraliaCash (AUS) ... Author: farsider350 farsider350@protonmail.com Date: Sat Jan 5 02:10AM GMT+1000 List AusCash (AUS) Official project URL: https://australiacash.org Official block explorer URL: http://auscashexplorer.org	2019-01-10 15:08:22 +10:00
Bernard Labno	7e9bc1fee8	Altcoin disclaimer	2019-01-09 12:24:35 +01:00
Remus Golgot	26c26fa0df	List Persona (PRSN)	2019-01-09 09:54:12 +02:00
Manfred Karrer	48f138b08d	Update test	2019-01-08 09:03:31 +01:00
Manfred Karrer	845888556d	Update validation regex and add comment	2019-01-08 09:03:31 +01:00
Manfred Karrer	eca2e0200f	Add Beam	2019-01-08 09:03:30 +01:00
Christoph Atteneder	88a7292a06	Merge pull request #2217 from ManfredKarrer/list-grin ... Add Grin	2019-01-08 08:59:06 +01:00
Christoph Atteneder	df1a05cd3f	Merge pull request #2219 from ManfredKarrer/remove-BitcoinClashic ... Remove Bitcoin Clashic because it was not traded in past 3 months	2019-01-08 08:57:34 +01:00
Manfred Karrer	05f6c87e4c	Add support for grinbox addresses	2019-01-08 02:30:37 +01:00
Manfred Karrer	ff6984a3e3	Remove Bitcoin Clashic because it was not traded in past 3 months	2019-01-08 01:19:07 +01:00
Manfred Karrer	0f80d57349	Merge pull request #2147 from wrkzdev/master ... List WrkzCoin (WRKZ)	2019-01-07 23:44:42 +01:00
Manfred Karrer	6a1b1c078f	Cleanup formatting	2019-01-07 23:42:56 +01:00
Manfred Karrer	1d72fe2059	Merge branch 'master' of https://github.com/noirofficial/bisq into noirofficial-master	2019-01-07 23:42:00 +01:00
Manfred Karrer	b2de7bad0a	Cleanup formatting	2019-01-07 23:39:03 +01:00
Manfred Karrer	7ff6ad46cc	Merge branch 'list-bitmark' of https://github.com/piratelinux/bisq into piratelinux-list-bitmark	2019-01-07 23:36:11 +01:00
Manfred Karrer	21f14b65d9	Add Grin	2019-01-07 23:28:57 +01:00
wrkzdev	1670e404ee	List WrkzCoin (WRKZ) ... Author: wrkzdev <40448869+wrkzdev@users.noreply.github.com> Date: Wed Dec 19 21:44:27 2018 +0700	2019-01-07 16:14:01 -05:00
Christoph Atteneder	c1c9a18056	Merge pull request #2176 from khaledalam/list-webchain-asset ... List Webchain (WEB)	2019-01-07 15:38:44 +01:00
Khaled Alam	5a8c95a2f6	List Webchain (WEB)	2018-12-27 23:11:32 +02:00
flo071	b61a3966c9	fix for Noir(NOR)	2018-12-27 20:51:07 +01:00
flo071	71c891ca17	fix for Noir(NOR)	2018-12-27 20:47:25 +01:00
flo071	321ffc0c76	List Noir(NOR) ... * Website: https://noirofficial.org * GitHub: https://github.com/noirofficial	2018-12-27 20:42:23 +01:00
CaveSpectre11	1a5cac9f98	Merge branch 'master' into list-gamblecoin-asset	2018-12-25 13:08:02 -05:00
Manfred Karrer	5cc3c57d52	Merge pull request #2159 from CaveSpectre11/list-ucc-asset ... List UnitedCommunityCoin (UCC)	2018-12-25 12:15:58 +01:00
Manfred Karrer	bb46ea0fcb	Merge pull request #2158 from CaveSpectre11/list-idapay-asset ... List IdaPay (IDA)	2018-12-23 14:04:04 +01:00
Manfred Karrer	d2d92a1db9	Merge pull request #2157 from CaveSpectre11/list-dextro-asset ... List Dextro (DXO)	2018-12-23 14:03:50 +01:00
Manfred Karrer	bcceac532d	Merge pull request #2150 from FourtyTwo/master ... List FourtyTwo (FRTY)	2018-12-23 14:03:33 +01:00
Cave Spectre	74c6a005c2	List GambleCoin (GMCN)	2018-12-21 10:33:40 -05:00
Cave Spectre	ddec9c791f	List IdaPay (IDA)	2018-12-21 09:49:34 -05:00
Cave Spectre	fac50426b4	List Dextro (DXO)	2018-12-21 09:36:15 -05:00
Cave Spectre	08b3a1118f	List UnitedCommunityCoin (UCC)	2018-12-21 09:25:09 -05:00
wangchao	a63d979872	List SpaceCash (SPACE)	2018-12-21 16:37:34 +08:00
Christoph Atteneder	a18ab4adf8	Merge pull request #2097 from Astrych/list-pinkcoin ... List Pinkcoin (PINK)	2018-12-20 09:49:01 +01:00
Christoph Atteneder	4f0fd9eafb	Merge pull request #2128 from geo-gs/list-siaprimecoin ... List SiaPrimeCoin (SCP)	2018-12-20 09:23:59 +01:00
George Carlson	82fd1df31e	List SiaPrimeCoin (SCP)	2018-12-19 15:17:52 -06:00
Manfred Karrer	55cdd0e1ed	Merge pull request #2144 from iridiumdev/List_Iridium(IRD) ... List Iridium (IRD)	2018-12-19 17:27:52 +01:00
Manfred Karrer	c398ac7846	Merge pull request #2102 from camthegeek/list-aeon ... List Aeon (AEON)	2018-12-19 17:21:40 +01:00
stevebrush	d3e9ca8899	List Iridium (IRD)	2018-12-19 11:33:12 +01:00
Manfred Karrer	937afdb92a	Merge pull request #2116 from a3rk/list-remix ... List Remix (RMX)	2018-12-19 11:17:21 +01:00
Manfred Karrer	578b1a13ef	Merge pull request #2004 from tarrenj/List_Horizen ... List Horizen (ZEN)	2018-12-19 10:25:28 +01:00
Manfred Karrer	5ff2534c0b	Merge pull request #1948 from Qbase-Foundation/list-qbase-asset ... List Qbase (QBS)	2018-12-19 10:25:12 +01:00
devopsralf	cd5139261a	List Remix (RMX)	2018-12-12 00:14:44 -05:00
sys96	9f52592a2c	List FourtyTwo (FRTY) ... Official project URL: [http://coin42.co] (Temporary address: http://coin42.tk) Official block explorer URL: [http://explorer.coin42.co]	2018-12-11 09:53:06 -05:00
camthegeek	46be816af7	List Aeon (AEON)	2018-12-10 07:50:11 -05:00
Christoph Atteneder	0bf2f9b88f	Merge pull request #2095 from ManfredKarrer/remove-basecurrencies-extra-nets ... Remove testnet and regtest for dash and ltc	2018-12-09 06:48:49 +01:00
Astrych	c1ee78196c	List Pinkcoin (PINK)	2018-12-09 01:01:04 +01:00
Manfred Karrer	6c0c3ace3c	Remove BCH ... Applying the proposal "Remove BCH from Bisq" (https://github.com/bisq-network/proposals/issues/61) There have been 44 upvotes and 0 downvotes so a clear signal that the Bisq community does not want to have BCH listed on Bisq.	2018-12-08 18:14:33 +01:00
Manfred Karrer	6c8f405488	Remove testnet and regtest for dash and ltc	2018-12-08 17:53:29 +01:00
Jake Tarren	bcbb7db4a4	Update Horizen (ZEN)	2018-12-07 15:23:22 -05:00
akrmn	f1d139882e	add Bitmark ... use latest validator class	2018-12-07 11:21:55 +01:00
Manfred Karrer	8507e0d665	Merge branch 'master' into release-candidate-0.9.0 ... # Conflicts: # assets/src/main/java/bisq/asset/coins/BitCloud.java # assets/src/main/java/bisq/asset/coins/Credits.java # assets/src/main/java/bisq/asset/coins/Cryptonodes.java # assets/src/main/java/bisq/asset/coins/DRIP.java # assets/src/main/java/bisq/asset/coins/FuturoCoin.java # assets/src/main/java/bisq/asset/coins/MegaCoin.java # assets/src/main/java/bisq/asset/coins/NewPowerCoin.java # assets/src/main/java/bisq/asset/coins/Wavi.java # assets/src/test/java/bisq/asset/coins/BitCloudTest.java # assets/src/test/java/bisq/asset/coins/CreditsTest.java # assets/src/test/java/bisq/asset/coins/CryptonodesTest.java # assets/src/test/java/bisq/asset/coins/DRIPTest.java # assets/src/test/java/bisq/asset/coins/FuturoCoinTest.java # assets/src/test/java/bisq/asset/coins/MegaCoinTest.java # assets/src/test/java/bisq/asset/coins/NewPowerCoinTest.java	2018-12-02 12:27:30 +01:00
Manfred Karrer	4da613f4b5	Merge branch 'master' into release-candidate-0.9.0 ... # Conflicts: # assets/src/main/java/bisq/asset/coins/BitCloud.java # assets/src/main/java/bisq/asset/coins/Credits.java # assets/src/main/java/bisq/asset/coins/Cryptonodes.java # assets/src/main/java/bisq/asset/coins/DRIP.java # assets/src/main/java/bisq/asset/coins/FuturoCoin.java # assets/src/main/java/bisq/asset/coins/MegaCoin.java # assets/src/main/java/bisq/asset/coins/NewPowerCoin.java # assets/src/main/java/bisq/asset/coins/Wavi.java # assets/src/test/java/bisq/asset/coins/BitCloudTest.java # assets/src/test/java/bisq/asset/coins/CreditsTest.java # assets/src/test/java/bisq/asset/coins/CryptonodesTest.java # assets/src/test/java/bisq/asset/coins/DRIPTest.java # assets/src/test/java/bisq/asset/coins/FuturoCoinTest.java # assets/src/test/java/bisq/asset/coins/MegaCoinTest.java # assets/src/test/java/bisq/asset/coins/NewPowerCoinTest.java	2018-12-02 12:27:03 +01:00
Cave Spectre	2288042080	Issue 2021 - Asset validation override issues in many coin extensions ... - Fix length issue in regular expression of validate() override in main asset coins. PIVX most likely started the 1+{25,34} that was then proliferated through the copies. While it likely should be 1+33, I could only confirm that 35 is too long, so the code is changed to be 1+{24,33} in order to reduce it by the presumed forgotten first character. - Fixup testInvalidAddresses() to better test regex rules in test asset coins. The PIVX base code was testing against 3 addresses, that all had a different first character, therefore none of the rest of the regular expression was being tested. Changed those addresses (and others for other susceptable coins) to accurately test first character match, length, and invalid characters in the 24 to 33 series.	2018-12-01 14:57:30 -05:00
Manfred Karrer	9d20fb2d6f	Cleanup, add final	2018-11-27 01:11:27 +01:00
Manfred Karrer	daed92eb18	Remove asset	2018-11-27 01:10:57 +01:00
Manfred Karrer	1e11d47ccb	Remove assets	2018-11-27 01:10:48 +01:00
Manfred Karrer	cc46722743	Remove Bitcoin 2 ... See https://github.com/bisq-network/proposals/issues/60	2018-11-27 01:09:52 +01:00
Manfred Karrer	3c5066027b	Remove ICO coins	2018-11-27 01:09:30 +01:00
Manfred Karrer	0ffe38a38e	Update comment	2018-11-26 19:59:15 +01:00
Manfred Karrer	5802b01599	Remove not traded coin	2018-11-26 15:30:19 +01:00
Manfred Karrer	fe2f5e15d1	Remove not traded coin	2018-11-26 03:28:26 +01:00
Manfred Karrer	7889015f1f	Remove testclasses	2018-11-26 02:40:19 +01:00
Manfred Karrer	0ba936ec9f	Remove not traded assets	2018-11-26 02:31:25 +01:00
Manfred Karrer	48620d406c	Add comment for ICO tokens	2018-11-26 02:19:39 +01:00
Ross Goldberg	6ec318cf7c	List Qbase (QBS)	2018-11-21 13:11:57 -06:00
Chris Beams	cd616ffaf3	Merge pull request #1944 from henryBTR/list-bitcoinrhodium-asset ... List Bitcoin Rhodium (XRC)	2018-11-20 14:29:44 +01:00
Chris Beams	666a888ad1	Merge pull request #1927 from devinbileck/add-gitattributes ... Add gitattributes	2018-11-20 14:20:47 +01:00
henryBTR	9fd26676af	List Bitcoin Rhodium (XRC)	2018-11-19 19:32:49 +01:00
Manfred Karrer	95554441e5	Merge pull request #1825 from MUEDEV/list-monetaryunit ... List MonetaryUnit (MUE)	2018-11-16 20:38:46 -05:00
Manfred Karrer	5714ce5b70	Merge pull request #1818 from Actinium-project/update-asset-actinium ... Update: Actinium (ACM) - Support p2sh-SegWit Addresses	2018-11-16 20:38:29 -05:00
Manfred Karrer	78e78f6b79	Merge pull request #1798 from alfredmox/list-mox-project ... List MoX (MOX)	2018-11-16 20:37:56 -05:00
Devin Bileck	fa5c402af5	Normalize line endings	2018-11-15 22:42:21 -08:00
Manfred Karrer	c9e95013c3	Merge branch 'delist-untraded-assets' of https://github.com/cbeams/bisq into cbeams-delist-untraded-assets ... # Conflicts: # assets/src/main/resources/META-INF/services/bisq.asset.Asset # core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java	2018-11-08 16:48:22 -05:00
diablax	8aca297edf	List Mask (MASK)	2018-11-07 03:28:34 -08:00
Chris Beams	247f383c2d	Remove untraded assets	2018-11-06 21:08:24 +01:00
Chris Beams	34a82ba890	Deprecate insufficiently traded assets ... - Remove assets from META-INF/services/bisq.asset.Asset - Preserve asset types but mark as @Deprecated - @Ignore asset tests Preserving the types is important from a compatibility perspective. Users who have traded these assets in the past, however few there may be, need to be able to classload the asset type(s) in order to avoid errors when browsing through their trade portfolio history.	2018-11-06 21:08:24 +01:00
Chris Beams	c8956567e4	Pull up remaining assets config to root	2018-11-04 16:45:00 +01:00
Chris Beams	83118b6640	Remove assets Javadoc jar ... Previously, when assets was managed as a separate library and repository, its Javadoc was published via Jitpack and linked to from the documentation at https://bisq.network. This is no longer the case, and therefore building the Javadoc jar is no longer necessary.	2018-11-04 16:28:43 +01:00
Chris Beams	f6a68f8aef	Pull up common JavaCompile config to root	2018-11-04 14:20:55 +01:00
Chris Beams	4e1fa914a2	Pull up common repositories to root build.gradle	2018-11-04 14:20:55 +01:00
Chris Beams	95c8b8ddfa	Pull up application and configuration of java plugin	2018-11-04 14:20:55 +01:00
Chris Beams	3c1c402d40	Remove use of maven plugin ... It is no longer necessary to publish Maven metadata about common, core and other submodules as they are no longer managed as separate libraries in separate repositories. The only way these modules should be getting referenced is from within applications in this repository such as desktop, statsnode, etc. Essentially, we're no longer publishing our libraries for public consumption.	2018-11-04 13:19:06 +01:00
Chris Beams	cc5ed491be	Eliminate unnecessary dependency from assets->common	2018-11-04 10:16:59 +01:00
Sotiris Blad	425b85a9b3	List MonetaryUnit (MUE)	2018-10-27 21:26:37 +03:00
Harris Brakmic	4a04ace438	update: support p2sh-segwit addresses	2018-10-25 18:38:26 +02:00
alfredmox	9f2428113f	List MoX (MOX) ... slight test modification last test	2018-10-21 14:11:26 -07:00
Manfred Karrer	2133b37837	Merge pull request #1706 from Mentors4EDU/List-EtherStone-(ETHS) ... List EtherStone (ETHS)	2018-10-15 12:30:59 -05:00
Manfred Karrer	6a6f648142	Merge pull request #1723 from blur-network/list-blur-asset ... List Blur (BLUR)	2018-10-15 12:29:57 -05:00
Manfred Karrer	3517c2f155	Merge pull request #1750 from CryptoForge/add-zero-asset ... List Zero (ZER)	2018-10-15 12:29:42 -05:00
Manfred Karrer	7a6cff6ba1	Merge pull request #1754 from Actinium-project/list-actinium ... List Actinium (ACM)	2018-10-15 12:29:21 -05:00
The Blur Network	2b39e604a9	List Blur (BLUR)	2018-10-11 17:03:34 -04:00
aejontargaryen	6d7b2dc777	List Dragonglass (DRGL)	2018-10-07 16:04:03 -04:00
Manfred Karrer	e2c830e632	Merge pull request #1657 from neoscoin/list-neos-coin ... List Neos (NEOS)	2018-10-05 15:19:45 -05:00
Manfred Karrer	7a22958523	Merge branch 'master' of https://github.com/xwebnetwork/bisq into xwebnetwork-master ... # Conflicts: # assets/src/main/resources/META-INF/services/bisq.asset.Asset	2018-10-05 14:13:48 -05:00
Manfred Karrer	f197cc0d82	Merge branch 'master' of https://github.com/xwebnetwork/bisq into xwebnetwork-master ... # Conflicts: # assets/src/main/resources/META-INF/services/bisq.asset.Asset	2018-10-05 14:13:44 -05:00
Manfred Karrer	881ee1949f	Merge pull request #1667 from greenblockcoin/list-greenblockcoin ... List Greenblockcoin (GBK)	2018-10-05 14:11:23 -05:00
Manfred Karrer	93ffa7ef6d	Merge branch 'list-pzdc-coin' of https://github.com/pzdc-project/bisq into pzdc-project-list-pzdc-coin ... # Conflicts: # assets/src/main/resources/META-INF/services/bisq.asset.Asset	2018-10-05 14:09:50 -05:00
Manfred Karrer	0fe8216418	Merge branch 'list-pzdc-coin' of https://github.com/pzdc-project/bisq into pzdc-project-list-pzdc-coin ... # Conflicts: # assets/src/main/resources/META-INF/services/bisq.asset.Asset	2018-10-05 14:09:46 -05:00
Manfred Karrer	e92c9a0e48	Merge branch 'list-qrl-asset' of https://github.com/scottdonaldau/bisq into scottdonaldau-list-qrl-asset ... # Conflicts: # assets/src/main/resources/META-INF/services/bisq.asset.Asset	2018-10-05 14:04:49 -05:00