Jakub Chrzanowski 307d2ad4a9 Merge remote-tracking branch 'remotes/upstream/master'
# Conflicts:
#	code_samples/conditional_operator_intention/src/test/java/org/intellij/sdk/intention/ConditionalOperatorConverterTest.java
2020-04-16 13:29:55 +02:00
..