Matthew K. Fu JuYuan 7e355b77c2 Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap ... Conflicts: Gemfile Gemfile.lock app/views/admin/attributes/_app_selector.html.erb app/views/admin/module_apps/_app_selector.html.erb app/views/admin/pages/_app_selector.html.erb config/application.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/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb		2012-04-19 14:31:05 +08:00
..
announcement	Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap	2012-04-19 14:06:00 +08:00
page_content	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-04-05 15:24:39 +08:00
web_resource	Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap	2012-04-19 14:31:05 +08:00