Merge remote-tracking branch 'origin/3.1'

This commit is contained in:
Ingo Schommer 2014-06-16 08:44:42 +12:00
commit f7c23b9007

View File

@ -13,7 +13,6 @@ default:
files_path: %behat.paths.base%/framework/tests/behat/features/files/ files_path: %behat.paths.base%/framework/tests/behat/features/files/
default_session: selenium2 default_session: selenium2
javascript_session: selenium2 javascript_session: selenium2
goutte: ~
selenium2: selenium2:
browser: firefox browser: firefox