Mike Rosseel 3108e784cc Merge remote-tracking branch 'origin/DAO' into disk-protobuffer ... Conflicts: core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java		2017-05-11 14:42:19 +02:00
..
rpc_regtest	Add timeout	2017-04-25 11:30:08 -05:00
bisq-sn.cron.sh	Rebranding: replace bitsquare with bisq	2017-03-12 16:00:40 -05:00
bisq-sn.init.sh	Rebranding: replace bitsquare with bisq	2017-03-12 16:00:40 -05:00
bisq.conf	Rebranding: replace bitsquare with bisq	2017-03-12 16:00:40 -05:00
build.md	CompensationRequest done (added extends Persistable), ProcessModel done.	2017-05-04 22:19:49 +02:00
CONTRIBUTING.md	Rebranding: Change occurance of Bitsquare to bisq	2017-03-12 14:28:14 -05:00
install_on_unix.sh	Update build files (add protobuffer dependency)	2017-04-23 13:04:45 -05:00
install_on_unix_fin.sh	Rebranding: replace bitsquare with bisq	2017-03-12 16:00:40 -05:00
modena.css	Support multiline for alerts	2016-02-11 10:35:19 +01:00
monitor-bisq-sn.cron.sh	Rebranding: replace bitsquare with bisq	2017-03-12 16:00:40 -05:00
policy-file-setup.md	Rebranding: replace bitsquare with bisq	2017-03-12 16:00:40 -05:00
protobuffer.md	CompensationRequest done (added extends Persistable), ProcessModel done.	2017-05-04 22:19:49 +02:00
rpc.md	Update build files (add protobuffer dependency)	2017-04-23 13:04:45 -05:00
seed-node-daemon.md	Rebranding: replace bitsquare with bisq	2017-03-12 16:00:40 -05:00
ui-development-notes.md	Rebranding: replace bitsquare with bisq	2017-03-12 16:00:40 -05:00
update_fork_bitcoinj.sh	Rebranding: replace bitsquare with bisq	2017-03-12 16:00:40 -05:00