edit.html.erb
133 Bytes
-
Conflicts: app/helpers/application_helper.rb app/helpers/layout_helper.rb app/models/community.rb app/models/enterprise.rb app/models/product_category.rb app/views/account/change_password.html.erb config/boot.rb config/environment.rb config/routes.rb lib/noosfero/plugin.rb test/unit/enterprise_activation_test.rb test/unit/person_notifier_test.rb