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