Merge branch 'QA_4_3'

phpmyadmin · Jan 7, 2015 · 84eca31 · 84eca31
2 parents 7f359ce + 2770234
commit 84eca31
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog
 - bug #4689 Setup tool creates "pma__favorites" incorrectly
 - bug #4685 Call to a member function isUserType() on a non-object
 - bug #4691 Do not include console when no server is selected
+- bug #4688 File permissions in archive
 
 4.3.5.0 (2015-01-05)
 - bug       Auto-configuration: tables were not created automatically

diff --git a/js/codemirror/addon/runmode/runmode.js b/js/codemirror/addon/runmode/runmode.js
diff --git a/js/codemirror/lib/codemirror.js b/js/codemirror/lib/codemirror.js
diff --git a/js/codemirror/mode/sql/sql.js b/js/codemirror/mode/sql/sql.js
diff --git a/themes/original/img/console.png b/themes/original/img/console.png
diff --git a/themes/pmahomme/img/console.png b/themes/pmahomme/img/console.png