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
..
registration.rb	authorization, module auth, category auth, member roles	2014-05-01 15:14:16 +08:00
side_bar.rb	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00