chris f76ead6ea5 Revert "Do not show announcement in json and rss if no title in I18n.locale (fix)" ... This reverts commit f72697ae76.		2013-09-30 16:35:21 +08:00
..
panel/announcement	Revert "Do not show announcement in json and rss if no title in I18n.locale (fix)"	2013-09-30 16:35:21 +08:00
.gitkeep	merge with master	2012-01-11 20:31:52 +08:00
application_controller.rb	merge with master	2012-01-11 20:31:52 +08:00