Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-09-09 15:27:33 +02:00
commit c4f47e4f46
2 changed files with 2 additions and 2 deletions

2
README
View File

@ -3,7 +3,7 @@ phpMyAdmin - Readme
Version 4.6.0-dev
A set of PHP-scripts to manage MySQL over the web.
A web interface for MySQL and MariaDB.
https://www.phpmyadmin.net/

View File

@ -1,7 +1,7 @@
phpMyAdmin
==========
A set of PHP-scripts to manage MySQL over the web.
A web interface for MySQL and MariaDB.
https://www.phpmyadmin.net/