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
..
rpc_regtest	Update btc conf file with stricter access	2017-07-27 19:48:37 +02:00
bisq-sn.cron.sh	Merge DAO branch to Development branch	2017-06-27 01:30:24 +02:00
bisq-sn.init.sh	Merge DAO branch to Development branch	2017-06-27 01:30:24 +02:00
bisq.conf	Merge DAO branch to Development branch	2017-06-27 01:30:24 +02:00
build.md	Merge branch 'Development'	2017-11-16 10:39:08 -05:00
CONTRIBUTING.md	Update doc/CONTRIBUTING.md to request PRs on master	2018-01-23 09:45:13 +01:00
install_on_unix_fin.sh	Merge DAO branch to Development branch	2017-06-27 01:29:54 +02:00
install_on_unix.sh	Merge Development	2017-09-17 11:28:34 -05:00
modena.css
monitor-bisq-sn.cron.sh	Merge DAO branch to Development branch	2017-06-27 01:30:24 +02:00
policy-file-setup.md	Merge DAO branch to Development branch	2017-06-27 01:30:24 +02:00
protobuffer.md	Update doc	2017-07-16 15:24:40 +02:00
rpc.md	-Refactoring: Rename BsqChainState to BsqBlockChain	2017-12-05 16:16:34 -05:00
seed-node-daemon.md	Merge DAO branch to Development branch	2017-06-27 01:29:54 +02:00
ui-development-notes.md	Merge pull request #1069 from ripcurlx/patch-2	2017-12-07 11:12:42 -05:00
update_fork_bitcoinj.sh	Merge DAO branch to Development branch	2017-06-27 01:29:54 +02:00