Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30
parent e1f319eef1 7be8236208
commit c9253c0a0e
144 changed files with 81403 additions and 55891 deletions
--- a/setup/lib/forms.inc.php
+++ b/setup/lib/forms.inc.php
@@ -170,6 +170,7 @@ $forms['Import_defaults'] = array('Import' => array(
    'skip_queries'));
 $forms['Export_defaults'] = array('Export' => array(
    'format',
+    'method',
    'compression',
    'asfile',
    'charset',