Manfred Karrer 34dd0b71d0 Merge branch 'Development' into dao ... # Conflicts: # gui/src/main/java/io/bisq/gui/bisq.css # gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.java # gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java # gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java # gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.java # gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java		2018-01-24 19:44:01 -05:00
..
src	Merge branch 'Development' into dao	2018-01-24 19:44:01 -05:00
pom.xml	Release 0.6.4	2018-01-20 20:47:53 -05:00