Commit Graph

52 Commits

Author SHA1 Message Date
manson 4621ba8e9d Update Announcement module 2014-05-02 19:04:20 +08:00
Harry Bomrah a72d5fbb48 change in parser and new template for 4.5
Conflicts:
	app/controllers/admin/dashboards_controller.rb
	config/application.rb
2014-05-02 18:26:21 +08:00