Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into rte

This commit is contained in:
Rouslan Placella 2011-05-25 11:05:58 +01:00
commit 8469bf8280

2
.gitignore vendored
View File

@ -29,3 +29,5 @@ locale
sources
# API documentation
apidoc
# Demo server
revision-info.php