Matthew K. Fu JuYuan a31a9c4792 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 ... Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/helpers/application_helper.rb app/models/ad_banner.rb		2012-05-16 12:13:07 +08:00
..
assets	Changes for widgets	2012-05-13 21:55:39 +08:00
controllers	Add impressionist	2012-05-15 21:26:09 +08:00
helpers	starting ad_banner auth	2012-05-15 09:57:05 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	Add impressionist	2012-05-15 21:26:09 +08:00
views	Change assets	2012-05-16 11:07:11 +08:00