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
..
aspects_spec.rb
contacts_spec.rb	Merge pull request #5170 from khall/issue_5149a	2014-08-27 18:20:56 +02:00
notifications_spec.rb
people_spec.rb
status_messages_spec.rb
streams_spec.rb