Merge remote-tracking branch 'origin/master'
# Conflicts:
#	build.gradle
commit 22feebb8fa28b2f38ca2e34ea73786c36840bf4f
2 parents ae8f3aa + 02bd309
rnentjes authored on 9 Dec 2016
Showing 1 changed file
View
build.gradle