Merge branch 'QA_4_6'

phpmyadmin · Dec 19, 2016 · a8018c2 · a8018c2
2 parents 2a6b05d + 33af5ac
commit a8018c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/doc/faq.rst b/doc/faq.rst
@@ -146,7 +146,7 @@ The MySQL manual explains how to `reset the permissions
 1.15 I have problems with *mysql.user* column names.
 ----------------------------------------------------
 
-In previous MySQL versions, the ``User`` and ``Password``columns were
+In previous MySQL versions, the ``User`` and ``Password`` columns were
 named ``user`` and ``password``. Please modify your column names to
 align with current standards.
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -27,9 +27,9 @@
             <directory suffix="_test.php">test/libraries/rte</directory>
             <directory suffix="_test.php">test/libraries</directory>
         </testsuite>
-        <!-- <testsuite name="Selenium">
+        <testsuite name="Selenium">
             <directory suffix="Test.php">test/selenium</directory>
-        </testsuite> -->
+        </testsuite>
     </testsuites>
 
     <logging>