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
..
authorizations_controller.rb	authorization, module auth, category auth, member roles	2014-05-01 15:14:16 +08:00
dashboards_controller.rb	Update Announcement module	2014-05-01 16:44:01 +08:00
items_controller.rb	Added Login, authenticate_user, current_user	2014-04-14 18:40:17 +08:00
members_controller.rb	authorization, module auth, category auth, member roles	2014-05-01 15:14:16 +08:00
module_apps_controller.rb	authorization, module auth, category auth, member roles	2014-05-01 15:14:16 +08:00
sites_controller.rb	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
tags_controller.rb	Tag	2014-04-21 15:08:05 +08:00