Commit 0c492029 authored by Romain Bioteau's avatar Romain Bioteau
Browse files

Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	community/pom.xml
parents 1d976bab f6e045e4
...@@ -84,7 +84,7 @@ public class ActorMappingConfigurationWizardPage extends WizardPage ...@@ -84,7 +84,7 @@ public class ActorMappingConfigurationWizardPage extends WizardPage
private Button roleButton; private Button roleButton;
private Button membershipButton; private Button membershipButton;
private Button userButton; private Button userButton;
private Optional<Organization> deployedOrganization; private Optional<Organization> deployedOrganization = Optional.empty();
public ActorMappingConfigurationWizardPage() { public ActorMappingConfigurationWizardPage() {
super(ActorMappingConfigurationWizardPage.class.getName()); super(ActorMappingConfigurationWizardPage.class.getName());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment