Christian Basler 8df42a6cf0 Merge branch 'develop' into feature/ACK ...

# Conflicts:
#	core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java

2016-04-28 19:32:21 +02:00

..

src

Merge branch 'develop' into feature/ACK

2016-04-28 19:32:21 +02:00

build.gradle

Renamed module 'domain' to 'core' to make its purpose more clear

2016-01-17 05:42:49 +01:00