patrick-werner 8872fc94c5 Merge remote-tracking branch 'origin/master' into documentOperation
# Conflicts:
#	hapi-tinder-plugin/src/main/resources/vm/jpa_resource_provider.vm
#	hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans.vm
#	hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans_java.vm
2018-05-28 17:05:50 +02:00
..