Fixed bug in edit conflict merge feature -- didn't decompress old_text
[lhc/web/wiklou.git] / .cvsignore
1 LocalSettings.php
2 AdminSettings.php