Andras Slemmer 6a2217ace6 Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb		2018-02-21 18:10:37 +00:00
..
jackson	Minor: upgrade some Spring Boot deps and tweak the Jackson version it uses to avoid a conflict with Kotlin 1.2.20	2018-02-08 13:31:47 +00:00
jfx	Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb	2018-02-20 13:26:31 +00:00
mock	Reformat files in client	2017-10-09 15:26:39 +01:00
rpc	Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb	2018-02-21 18:10:37 +00:00