Download as
Browse Code »

Commit 6747b15a8ee1006e59f29562323bb063a7fcc326

Authored by Weblate
2 parents 7b204ed0 cb6e853e
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge remote-tracking branch 'origin/master'

Showing 1 changed file with 2 additions and 0 deletions   Show diff stats
plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb
  Diff comments   View file @6747b15
1 class SubOrganizationsPlugin::Relation < Noosfero::Plugin::ActiveRecord 1 class SubOrganizationsPlugin::Relation < Noosfero::Plugin::ActiveRecord
  2 + record_timestamps = false
  3 +
2 belongs_to :parent, :polymorphic => true 4 belongs_to :parent, :polymorphic => true
3 belongs_to :child, :polymorphic => true 5 belongs_to :child, :polymorphic => true
4 6