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

Browse Source

Conflicts:
	vendor/built_in_modules/news/app/models/news_bulletin.rb

...

This commit is contained in:

Christophe Vilayphiou 2012-08-09 17:05:40 +08:00

parent 1e7bc9aadd 987e6fff2b

commit f77043e632

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

Diff Content Not Available