Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var

Browse Source

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

...

This commit is contained in:

Christophe Vilayphiou 2012-07-27 19:21:39 +08:00

parent cd6d95204f c4722d0d2f

commit 23854e7adc

1 changed files with 30 additions and 30 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files