Download as
Browse Code »

Commit 6747b15a8ee1006e59f29562323bb063a7fcc326

Authored by Weblate
2 parents 7b204ed0 cb6e853e
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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