This repository has been archived on 2024-03-16. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Christophe Vilayphiou 198825a309 Merge branch 'master' 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
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

2012-04-12 18:50:48 +08:00

..

built_in_modules

Merge branch 'master' into ldap

2012-04-12 18:50:48 +08:00

plugins

Merge with sub_roles

2011-12-23 18:34:21 +08:00