Merge branch 'fc/rerere-conflict-style' into maint
[gitweb.git] / contrib / mw-to-git / t / install-wiki /
drwxr-xr-x   parent (dest: contrib/mw-to-git/t; base: ada8710e634b4f9f686bd0477bd92b272ec60801)
-rw-r--r-- 4390 LocalSettings.php
-rw-r--r-- 3594 db_install.php