Robin Ward b2d478a6fc Merge branch 'master' of github.com:awesomerobot/discourse into awesomerobot-master ... Conflicts: app/assets/javascripts/discourse/templates/header.hbs		2014-10-08 13:48:26 -04:00
..
assets	Merge branch 'master' of github.com:awesomerobot/discourse into awesomerobot-master	2014-10-08 13:48:26 -04:00
controllers	FIX: Category latest pages were not preloading properly, causing weird	2014-10-08 12:45:18 -04:00
helpers	Renaming site contents to site text	2014-09-24 16:08:14 -04:00
jobs	FIX: badge granted titles were not being revoked when badge was revoked	2014-10-08 10:26:18 +11:00
mailers	remove the notification_email_top customization	2014-10-06 17:00:20 -04:00
models	FIX: Category latest pages were not preloading properly, causing weird	2014-10-08 12:45:18 -04:00
serializers	FEATURE: trust level 3: likes received must be on min_likes_received/3 different days, and be from min_likes_received/4 different users	2014-10-07 15:52:54 -04:00
services	FIX: badge granted titles were not being revoked when badge was revoked	2014-10-08 10:26:18 +11:00
views	remove the notification_email_top customization	2014-10-06 17:00:20 -04:00