remove merges from changelog on website, unclobber config.d
[public/www-new.git] / bin /
drwxr-xr-x   ..
-rw-r--r-- 39 .htaccess
-rwxr-xr-x 132 changelog.sh
drwxr-xr-x - contrib