Tudor Malene 12b79fc40b Fix merge

2018-11-19 18:13:07 +00:00

..

capsule

Merge commit 'df4699c69abc8aab7e1e44b602c762212cbf93f6' into chrisr3-os-merge

2018-09-17 14:01:09 +01:00

dist

really disable building installer dist on OS X (#1547)

2018-11-07 18:16:51 +00:00

lib

Integration tests in database mode - add Oracle 12.1 JDBC driver directly into libs dir (#1399)

2018-09-19 20:49:00 +01:00

src

Fix merge

2018-11-19 18:13:07 +00:00

build.gradle

Merge branch 'os-merge-point' into os-merge-shams

2018-11-14 18:13:01 +00:00