Christophe Vilayphiou 959def6c1f Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt ... Conflicts: app/models/item.rb config/locales/en.yml vendor/built_in_modules/announcement/app/models/bulletin.rb vendor/built_in_modules/news/app/models/news_bulletin.rb		2012-08-08 14:48:29 +08:00
..
announcement	Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt	2012-08-08 14:48:29 +08:00
news	Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt	2012-08-08 14:48:29 +08:00
page_content	Put back impressionist where it was commented out	2012-08-04 15:42:53 +08:00
web_resource	Check for 'http' or 'https' before saving a link	2012-08-04 16:29:31 +08:00