Christophe Vilayphiou 7c55f6fb88 Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth ... Conflicts: config/environments/development.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/announcements_controller.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb vendor/built_in_modules/announcement/app/models/bulletin.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb vendor/built_in_modules/announcement/config/routes.rb vendor/built_in_modules/web_resource/lib/tasks/web_resource_tasks.rake		2012-02-29 19:03:29 +08:00
..
panel/announcement	Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth	2012-02-29 19:03:29 +08:00
.gitkeep	merge with master	2012-01-11 20:31:52 +08:00
application_controller.rb	merge with master	2012-01-11 20:31:52 +08:00