app/controllers/publics_controller.rb · 137181e07f6027f3b3162cdb2ec6fb44765c733a · facil / parlote-facil

13 years ago

Merge branch 'master' into follow. all specs green. · 106ae983

danielgrippi a rédigé 13 years ago

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb

106ae983

Historique

Merge branch 'master' into follow. all specs green.

danielgrippi a rédigé 13 years ago

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb

specs NaN Gio