lorilee aa49b85fad Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc ...

Conflicts:
	libraries/display_export.lib.php

2010-07-20 15:23:12 -07:00

..

darkblue_orange

Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc

2010-07-20 15:23:12 -07:00

original

Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc

2010-07-20 15:23:12 -07:00

.gitignore

Ignore non official themes.

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