Manfred Karrer 931d34ea82 Merge branch 'Development' into doa_with_translations ... # Conflicts: # gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml # gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java # gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.java # gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java		2017-03-06 21:25:10 -05:00
..
java/io/bitsquare	Merge branch 'Development' into doa_with_translations	2017-03-06 21:25:10 -05:00
resources	Remove text string in fxml files	2017-03-06 21:17:10 -05:00