orbit-basic/vendor/built_in_modules/announcement/app/models
Christophe Vilayphiou 23854e7adc Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var
Conflicts:
	app/controllers/pages_controller.rb
	app/models/item.rb
	app/models/site.rb
	config/environments/development.rb
	vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-07-27 19:21:39 +08:00
..
.gitkeep merge with master 2012-01-11 20:31:52 +08:00
announcement_tag.rb Remove i18n_variable for announcement 2012-07-27 19:12:58 +08:00
bulletin.rb Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var 2012-07-27 19:21:39 +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 Remove i18n_variable for announcement 2012-07-27 19:12:58 +08:00
unit_list_for_anc.rb Remove i18n_variable for announcement 2012-07-27 19:12:58 +08:00