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 |
---|
|
.idea/workspace.xml |
---|