Merge "Fix https://gerrit.wikimedia.org/r/4830 , I botched the conflict resolution...
[lhc/web/wiklou.git] / images /
drwxr-xr-x   ..
-rw-r--r-- 180 .htaccess
-rw-r--r-- 203 README