| commit | f7626c6d277a30078bb223f9304e44c657b2e882 | |
| author | Marc Delisle <marc@infomarc.info> | |
| Mon, 3 Aug 2015 20:05:02 +0000 (3 16:05 -0400) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Mon, 3 Aug 2015 20:05:02 +0000 (3 16:05 -0400) | ||
| tree | 64d2575851f11da75497ef2f0cab4047d78df702 | treesnapshot (tar.gz zip) |
| parent | 36ba14ad8ef27ea0098211465bf6ee56f8a81cf0 | commitdiff |
| parent | e48f2127fb9710502f496a9806d9f62e95f225a2 | commitdiff |
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin