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

..

built_in_modules

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

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

impressionist

Move Impressionist to Gemfile

2012-07-27 19:14:25 +08:00

plugins

New and Announcement search. Disabled impression.

2012-07-20 15:47:40 +08:00