developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/vendor/built_in_modules/announcement/app
History
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
..
assets Changes for widgets 2012-05-13 21:55:39 +08:00
controllers Remove i18n_variable for announcement 2012-07-27 19:12:58 +08:00
helpers Remove i18n_variable for announcement 2012-07-27 19:12:58 +08:00
mailers merge with master 2012-01-11 20:31:52 +08:00
models Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var 2012-07-27 19:21:39 +08:00
views Fix announcement for i18n_variable removal 2012-07-27 19:12:58 +08:00