Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/wicket/panels/ActivityPanel.java

@@ -76,7 +76,7 @@
                        .getWhen(), getTimeZone(), getTimeUtils()));



                  // avatar

                  commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 40));

                  commitItem.add(new AvatarImage("avatar", commit.getAuthorIdent(), 40));



                  // merge icon

                  if (commit.getParentCount() > 1) {