Merge from stable

This commit is contained in:
Thomas Reynolds 2015-02-24 11:06:28 -08:00
commit c94e5d0f4d
30 changed files with 99 additions and 561 deletions

View file

@ -145,7 +145,7 @@ Feature: Minify Javascript
I'm a jQuery {{template}}.
</script>
"""
Scenario: Rendering external js with the feature enabled
Given a fixture app "minify-js-app"
And a file named "config.rb" with: