lorilee 2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin ...

Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php

2010-07-20 13:04:03 -07:00

..

darkblue_orange

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

2010-07-20 13:04:03 -07:00

original

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

2010-07-20 13:04:03 -07:00

.gitignore

Ignore non official themes.

2010-06-10 10:52:00 +02:00