developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap

Browse Source 
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
This commit is contained in:
Matthew K. Fu JuYuan committed 2012-04-19 14:31:05 +08:00
2 parents ba0677a001 92e898a656
commit 7e355b77c2
409 files changed
+57907 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/sessions_controller.rb
+1 -1
View File
@@ -60,4 +60,4 @@ private
# # p rss_paunit
#
end
end
end