Merge branch 'master' into #33_match-by-email
Conflicts:
	src/main/scala/view/AvatarImageProvider.scala
commit 4d066738eb8c9e93ce3201609dfe5c3bbc342597
2 parents 9a6a2d9 + cb12d03
@takezoe takezoe authored on 15 Oct 2013
Showing 1 changed file
View
src/main/scala/view/AvatarImageProvider.scala