Merge branch 'release/0.17.0.9'

ulmic · Apr 2, 2017 · 8ff11f0 · 8ff11f0
2 parents 464e9ae + 71bf7e5
commit 8ff11f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/decorators/member_decorator.rb b/app/decorators/member_decorator.rb
@@ -144,10 +144,6 @@ def corporate_email_link
     default_email_link :corporate_email
   end
 
-  def corporate_email
-    object.corporate_email
-  end
-
   include SocialNetworksUrlHelper
 
   def social_links

diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb
@@ -25,6 +25,10 @@ def small_avatar_url
     end
   end
 
+  def corporate_email
+    object.corporate_email
+  end
+
   alias element_avatar profile_avatar
 
   def select_presentation(options = {})