Manfred Karrer b9dfa0a7a7 Merge branch 'master' into Development ... # Conflicts: # common/pom.xml # common/src/main/java/io/bitsquare/app/Version.java # core/pom.xml # core/src/main/java/io/bitsquare/locale/CurrencyUtil.java # gui/pom.xml # jsocks/pom.xml # jtorctl/pom.xml # jtorproxy/pom.xml # network/pom.xml # package/linux/create_32bit_app.sh # package/linux/create_64bit_app.sh # package/mac/create_app.sh # package/windows/Bitsquare.iss # package/windows/create_32bit_app.bat # package/windows/create_app.bat # pom.xml # seednode/pom.xml		2016-05-05 13:30:18 +02:00
..
bitsquare-sn.cron.sh	Raise maximum memory in seed node cron script	2016-04-27 11:18:28 +02:00
bitsquare-sn.init.sh	Raise maximum connections in seed node init script	2016-04-27 11:17:40 +02:00
bitsquare.conf	change pom files for 0.3.2.2-SNAPSHOT	2015-12-20 20:20:14 +01:00
build.md	Add -DskipTests	2016-04-30 01:26:26 +02:00
modena.css	Support multiline for alerts	2016-02-11 10:35:19 +01:00
monitor-bitsquare-sn.cron.sh	Add monitor script to check for seed node connectivity and report issues	2016-04-27 11:01:49 +02:00
seed-node-daemon.md	Update init and cron script references to v0.4.4 (first official beta)	2016-04-27 11:15:44 +02:00
ui-development-notes.md	Add a reference to JavaFX documentation about code behind	2014-09-02 16:12:49 +02:00
update_fork_bitcoinj.sh	Add publish fork instructions for bitcoinj	2015-03-23 11:21:25 +01:00