Jonas Nicklas e330e88a5e Merge branch 'capy21' ... Conflicts: spec/basic_node_spec.rb		2013-02-15 22:53:15 +01:00
..
fixtures
rspec
basic_node_spec.rb	Merge branch 'capy21'	2013-02-15 22:53:15 +01:00
capybara_spec.rb
dsl_spec.rb
rack_test_spec.rb
result_spec.rb
rspec_spec.rb
selenium_spec.rb
server_spec.rb
spec_helper.rb