Merge branch 'jk/two-way-merge-corner-case-fix'
[gitweb.git] / contrib / mw-to-git / t / install-wiki /
drwxr-xr-x   parent (dest: contrib/mw-to-git/t; base: 3979580265bac968c30ce203022d7a8294710909)
-rw-r--r-- 4390 LocalSettings.php
-rw-r--r-- 3594 db_install.php