GitBucket
|
Merge branch 'master' of https://gitbucket.astraeus.nl/git/rnentjes/SimpleDatabase into HEAD
Conflicts: .idea/modules.xml .idea/modules/simple-database.iml very-simple-templates.iml Fix dependencies, new version |
|---|
|
|
| .idea/compiler.xml |
|---|
| .idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_2.xml 100644 → 0 |
|---|
| .idea/modules.xml |
|---|
| .idea/modules/simple-database.iml |
|---|
| .idea/workspace.xml |
|---|
| build.gradle |
|---|
| gradle/wrapper/gradle-wrapper.properties |
|---|