chris f7f0b48707 Merge branch 'master' of github.com:Rulingcom/NCCU ... Conflicts: config/initializers/resque.rb		2012-10-16 14:14:56 +08:00
..
assets	harry's js fix	2012-10-08 10:11:45 +08:00
controllers	object_auth change to reload	2012-10-04 18:20:21 +08:00
helpers	Add missing translations	2012-09-24 09:02:46 +08:00
jobs	merge	2012-10-01 21:09:09 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	object_auth change to reload	2012-10-04 18:20:21 +08:00
uploaders	Set default picture	2012-08-16 17:24:12 +08:00
views	object_auth change to reload	2012-10-04 18:20:21 +08:00