Download as
Browse Code »

Commit 30dbf4d769b552bf6eb8e3b2f597c2199f6fdf6f

Authored by Antonio Terceiro
1 parent 9c0082e5
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

ActionItem937: fixing bad merge

Showing 1 changed file with 1 additions and 2 deletions   Show diff stats
public/stylesheets/common.css
  Diff comments   View file @30dbf4d
@@ -481,8 +481,7 @@ div.pending-tasks { @@ -481,8 +481,7 @@ div.pending-tasks {
481 481
482 #wizard-content h1 { 482 #wizard-content h1 {
483 font-size: 22px; 483 font-size: 22px;
484 -=======  
485 - 484 +}
486 485
487 #portal-news { 486 #portal-news {
488 font-size: 11px; 487 font-size: 11px;