Skip to content

Commit

Permalink
Merge branch '3009-on-site-notification-of-new-activity' of github.co…
Browse files Browse the repository at this point in the history
…m:okfn/ckan into 3009-on-site-notification-of-new-activity

Conflicts:
	ckan/public/base/less/iehacks.less
  • Loading branch information
Sean Hammond committed Nov 14, 2012
2 parents 7a353d0 + ac6d81f commit 04d32ac
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ckan/public/base/less/iehacks.less
Expand Up @@ -68,6 +68,8 @@
.masthead .account a.image {
display: block;
width: 25px;
padding-right: 10px;
white-space: nowrap;
}
}

Expand Down

0 comments on commit 04d32ac

Please sign in to comment.