Matthew K. Fu JuYuan 661fcafe70 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team ... Conflicts: vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb		2012-05-18 18:50:10 +08:00
..
announcement	Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team	2012-05-18 18:50:10 +08:00
news	Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team	2012-05-18 18:50:10 +08:00
page_content	fix ad_banner. new ad_image with best size from ad_banner. content editable at tab	2012-05-17 23:35:46 +08:00
web_resource	Proof i18n_variable for categories	2012-05-18 10:28:28 +08:00