Fix conflicts in last commit

Aleksander Machniak

2013-07-04 c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0

1
2
3
4
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteRule !^(js|resources) - [F]
</IfModule>