Viktor Kolomeyko 6f3a6cb584 Merge remote-tracking branch 'open/master' into vkolomeyko/OS-merge ...

# Conflicts:
#	build.gradle

2018-09-12 09:54:58 +01:00

..

capsule

Fix merge conflict

2018-09-06 16:41:40 +01:00

dist

gradle magic to publish installer

2018-07-02 18:01:08 +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 vkolomeyko/OS-merge

2018-09-12 09:54:58 +01:00

build.gradle

Merge remote-tracking branch 'open/master' into anthony-os-merge-20180906

2018-09-06 11:20:45 +01:00