Omar Junior / Noosfero | GitLab

Software Público Brasileiro

c4cde510 Revert "Revert "Merge branch 'merge-requests/25'"" ... Browse Code »

This reverts commit 4e223943ab159d8fa7faf4b042ec3121d74ed32e.

Conflicts:

	app/controllers/my_profile/profile_members_controller.rb
	config/solr.yml.dist
	features/step_definitions/noosfero_steps.rb
	lib/tasks/test.rake
	test/functional/profile_members_controller_test.rb
	test/unit/category_finder_test.rb

2011-12-22 00:34:12 +0000

.gitignore 183 Bytes

Edit Raw Blame History

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17

*.log
*.log
*_pid
coverage/*
coverage.data
solr/solr/data/*
.svn
test/db/*.db
test/log/*.log
pkg/*
*.sw?
.DS_Store
coverage
rdoc
pkg
acts_as_solr_reloaded-*.gem
tags