Anthony Keenan af77c5a287 Merge remote-tracking branch 'open/master' into anthony-os-merge-20180418 ... # Conflicts: # constants.properties # docs/source/changelog.rst		2018-04-18 11:24:22 +01:00
..
capsule	Merge remote-tracking branch 'open/master' into merge/tudor-26-03	2018-03-26 14:07:28 +01:00
lib	Oracle 11xe and 12c database compatibility (#206)	2018-01-29 18:35:58 +00:00
src	Merge remote-tracking branch 'open/master' into anthony-os-merge-20180418	2018-04-18 11:24:22 +01:00
build.gradle	Remove logback SLF4J backend from node tests. (#659)	2018-03-30 23:52:53 +01:00