Commit Graph

2 Commits

Author SHA1 Message Date
nccu 2c6bdd4bac nccu branch 2014-11-07 16:06:50 +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