Sam 8264dbd971 Merge pull request #3140 from fullfatthings/fix_missing_sso_avatar_bug ... Fix bug when sso_overrides_avatar is true but no avatar_url is passed		2015-01-30 10:45:25 +11:00
..
assets	Merge pull request #3080 from riking/misc	2015-01-30 10:23:17 +11:00
controllers	Merge pull request #3080 from riking/misc	2015-01-30 10:23:17 +11:00
helpers	UX: Update 404 page category badge to use centralized helper and style	2015-01-28 14:56:38 -05:00
jobs	FEATURE: background job to make sure emoticons aren't too big	2015-01-29 18:36:35 +01:00
mailers	UX: Update 404 page category badge to use centralized helper and style	2015-01-28 14:56:38 -05:00
models	Merge pull request #3140 from fullfatthings/fix_missing_sso_avatar_bug	2015-01-30 10:45:25 +11:00
serializers	Merge branch 'master' of github.com:discourse/discourse	2015-01-29 17:39:52 -05:00
services	FIX: Respect user locale for reply notifications	2015-01-17 23:17:50 -08:00
views	UX: Update 404 page category badge to use centralized helper and style	2015-01-28 14:56:38 -05:00