Rueshyna fb931b0a4a Merge remote-tracking branch 'origin/desktop' into desktop ... * origin/desktop: Remove Gemfile.lock sort conference and type add conferene list order function css minor changes. gridster, url code fixed, views removed. Fix selection of sub_menu for widget (the value wasn't set) Fix bug in widget selection css minor changes. Fix public_r_tag selection gridster, url code fixed, views removed.		2013-02-26 17:02:01 +08:00
..
built_in_modules	Merge remote-tracking branch 'origin/desktop' into desktop	2013-02-26 17:02:01 +08:00
plugins	New and Announcement search. Disabled impression.	2012-07-20 15:47:40 +08:00