Merged #258 "Create an avatar provider that defaults to Gravatar"

author James Moger <james.moger@gitblit.com>

Mon, 15 Jun 2015 16:27:14 +0000 (10:27 -0600)

committer James Moger <james.moger@gitblit.com>

Mon, 15 Jun 2015 16:27:14 +0000 (10:27 -0600)
author James Moger <james.moger@gitblit.com>
Mon, 15 Jun 2015 16:27:14 +0000 (10:27 -0600)
committer James Moger <james.moger@gitblit.com>
Mon, 15 Jun 2015 16:27:14 +0000 (10:27 -0600)
diff --cc src/main/distrib/data/defaults.properties
Simple merge
author	James Moger <james.moger@gitblit.com>
	Mon, 15 Jun 2015 16:27:14 +0000 (10:27 -0600)
committer	James Moger <james.moger@gitblit.com>
	Mon, 15 Jun 2015 16:27:14 +0000 (10:27 -0600)