This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit d3f83ec6 authored by Michael Breu's avatar Michael Breu :speech_balloon:
Browse files

Merge branch 'development' into 'master' 

# Conflicts:
#   src/main/resources/.h2.server.properties
parents 00f89c26 cfe78cb3
Branches
1 merge request!203Just trivial merge back from master to development
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 10283 additions and 26789 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment