spec/controllers/aspects_controller_spec.rb · 3c6dd3d721c744555d952a8845a58bd72a54d1ed · facil / parlote-facil

14 years ago

danielvincent a rédigé 14 years ago

Conflicts:
	spec/controllers/people_controller_spec.rb
	spec/controllers/publics_controller_spec.rb
	spec/lib/diaspora/parser_spec.rb

3dd23844

danielvincent a rédigé 14 years ago

Conflicts:
	spec/controllers/people_controller_spec.rb
	spec/controllers/publics_controller_spec.rb
	spec/lib/diaspora/parser_spec.rb