diaspora/features
Jonne Haß ccd7c670b3 Merge pull request #5170 from khall/issue_5149a
Issue 5149a

Conflicts:
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
2014-08-27 18:20:56 +02:00
..
desktop Small style changes, add tests 2014-08-26 22:45:43 +02:00
mobile fix and stablize some cukes 2014-08-24 01:02:35 +02:00
step_definitions Merge pull request #5170 from khall/issue_5149a 2014-08-27 18:20:56 +02:00
support Convert specs to RSpec 3.0.4 syntax with Transpec 2014-08-26 17:11:44 -07:00