Christophe Vilayphiou 039e837fff Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 ... Conflicts: app/views/admin/object_auths_new_interface/_privilege_user.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/_modal_list.html.erb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_category_setting/setting.html.erb		2012-05-14 00:51:53 +08:00
..
panel/announcement	Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509	2012-05-14 00:51:53 +08:00
.gitkeep	merge with master	2012-01-11 20:31:52 +08:00