Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-12-19 09:16:21 +01:00
commit 677d1cd640
2 changed files with 3 additions and 3 deletions

View File

@ -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.

View File

@ -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>