Merge branch 'en/dirty-merge-fixes'
[gitweb.git] / contrib / mw-to-git / t / install-wiki /
drwxr-xr-x   parent (dest: contrib/mw-to-git/t; base: c18ac30e9ebcf7b7e2fbd992744e63c71089a12a)
-rw-r--r-- 4390 LocalSettings.php
-rw-r--r-- 3594 db_install.php