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
..
.gitkeep	merge with master	2012-01-11 20:31:52 +08:00
announcement_tag.rb	don't dislay web links if no eng. lists in widget is now sorted.	2012-08-01 15:24:55 +08:00
bulletin.rb	Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt	2012-08-08 14:48:29 +08:00
bulletin_category.rb	Fix announcement for i18n_variable removal	2012-07-27 19:12:58 +08:00
bulletin_file.rb	Remove i18n_variable for announcement	2012-07-27 19:12:58 +08:00
bulletin_link.rb	Check for 'http' or 'https' before saving a link	2012-08-04 16:29:31 +08:00
unit_list_for_anc.rb	Remove i18n_variable for announcement	2012-07-27 19:12:58 +08:00