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
..
Archive	new orbit bar fixed..	2013-07-30 16:43:35 +08:00
fonts	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
images	new ui member plugin sort fix and user show avatar fix	2013-09-27 11:04:52 +08:00
javascripts	added sync for journal paper books and conference.. and also disabled the icons	2013-09-26 22:29:21 +08:00
stylesheets	Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb	2013-09-26 20:31:46 +08:00