Matthew K. Fu JuYuan e4cc80248d Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad ... Conflicts: config/mongoid.yml		2012-08-23 16:08:17 +08:00
..
assets	authorization	2012-08-20 23:18:50 +08:00
controllers	Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad	2012-08-23 16:08:17 +08:00
helpers	guest user	2012-08-23 16:05:14 +08:00
jobs	add script for cache user	2012-05-29 17:17:26 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	guest user	2012-08-23 16:05:14 +08:00
uploaders	Gallery update..	2012-08-20 23:14:10 +08:00
views	Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad	2012-08-23 16:08:17 +08:00