1221c393a3
Conflicts: lib/oneboxer.rb lib/oneboxer/whitelist.rb spec/controllers/robots_txt_controller_spec.rb |
||
---|---|---|
.. | ||
fonts | ||
images | ||
javascripts | ||
stylesheets |
1221c393a3
Conflicts: lib/oneboxer.rb lib/oneboxer/whitelist.rb spec/controllers/robots_txt_controller_spec.rb |
||
---|---|---|
.. | ||
fonts | ||
images | ||
javascripts | ||
stylesheets |