Merge pull request #1 from salesagility/master

update
salesagility · Nov 25, 2015 · 4a2cc4d · 4a2cc4d
2 parents ff3e151 + 7b09b33
commit 4a2cc4d
Show file tree

Hide file tree

Showing 580 changed files with 2,642 additions and 36,245 deletions.
diff --git a/custom/Extension/application/Ext/Language/de_de.AdvancedOpenSales.php b/custom/Extension/application/Ext/Language/de_de.AdvancedOpenSales.php
diff --git a/custom/Extension/application/Ext/Language/de_de.SecurityGroups.php b/custom/Extension/application/Ext/Language/de_de.SecurityGroups.php
diff --git a/custom/Extension/application/Ext/Language/en_us.AdvancedOpenWorkflow.php b/custom/Extension/application/Ext/Language/en_us.AdvancedOpenWorkflow.php
@@ -55,7 +55,6 @@
 $app_list_strings['aow_process_status_list']['Failed'] = 'Failed';
 $app_list_strings['aow_condition_operator_list']['And'] = 'And';
 $app_list_strings['aow_condition_operator_list']['OR'] = 'OR';
-$app_list_strings['aow_condition_operator_list']['OR'] = 'OR';
 $app_list_strings['aow_condition_type_list']['Value'] = 'Value';
 $app_list_strings['aow_condition_type_list']['Field'] = 'Field';
 $app_list_strings['aow_condition_type_list']['Any_Change'] = 'Any Change';

diff --git a/custom/Extension/application/Ext/Language/fi_fi.AdvancedOpenSales.php b/custom/Extension/application/Ext/Language/fi_fi.AdvancedOpenSales.php
diff --git a/custom/Extension/application/Ext/Language/fr_FR.AdvancedOpenSales.php b/custom/Extension/application/Ext/Language/fr_FR.AdvancedOpenSales.php