Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
[gitweb.git] / contrib / mw-to-git / t / install-wiki /
drwxr-xr-x   parent (dest: contrib/mw-to-git/t; base: 785514bb5544fbe2604ea657530134671f82e4b1)
-rw-r--r-- 4390 LocalSettings.php
-rw-r--r-- 3594 db_install.php