harrybomrah 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

..

jquery.ui.widget.js

change in parser and new template for 4.5

2014-05-02 18:26:21 +08:00