chris 90f08c96fc Fix merge error: add missing delete route		2013-03-20 02:11:29 +08:00
..
locales	…
routes.rb	Fix merge error: add missing delete route	2013-03-20 02:11:29 +08:00