Matthew K. Fu JuYuan 7ca0d2a62b Merge branch 'master' of github.com:Rulingcom/NCCU ...

Conflicts:
	vendor/built_in_modules/announcement/app/models/bulletin.rb

2012-09-24 12:20:59 +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_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

bulletin.rb

Merge branch 'master' of github.com:Rulingcom/NCCU

2012-09-24 12:20:59 +08:00

unit_list_for_anc.rb

Remove i18n_variable for announcement

2012-07-27 19:12:58 +08:00