0 Fork 0

T

Christophe Vilayphiou 47215693c4 Merge branch 'master' into ldap

Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_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-03-19 14:27:15 +08:00

app

Merge branch 'master' into ldap

2012-03-19 14:27:15 +08:00

config

Merge branch 'master' into ldap

2012-03-19 14:27:15 +08:00

upgrade to rails3, but grip is broken

2010-03-08 16:04:05 +08:00

doc

init rails 2.3.2

2009-05-08 00:53:18 +08:00