Merge branch 'master' of https://gitbucket.astraeus.nl/git/rnentjes/simple-database-kotlin
# Conflicts:
#	.idea/modules/simple-database-kotlin_main.iml
#	.idea/modules/simple-database-kotlin_test.iml
#	build.gradle
#	src/nl/astraeus/database/Queries.kt
#	test/nl/astraeus/database/TestQueries.kt
1 parent 33b7adc commit e80e9200fdc39defb2c21bd6f419d8185b477918
rnentjes authored on 8 Oct 2016
Showing 1 changed file
View
.gitignore