devin chen 9963395b05 'select2' minor update ... Conflicts: app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak		2013-07-30 16:42:40 +08:00
..
ad_banner_preview.css.erb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
default_widget_setting.css	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00