saurabhbhatia 471987f800 Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb ... Conflicts: vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb		2013-09-27 11:10:07 +08:00
..
panel/member/front_end/member_lists	Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb	2013-09-27 11:10:07 +08:00
.gitkeep	user id set & user fields set & role set & member frontend list & user translation & create new member bug fix	2013-04-25 19:59:59 +08:00