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
..
admin	ad banner preview	2012-04-12 07:14:06 +08:00
devise	LDAP with sync rake task	2012-03-06 16:41:06 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Announcement modifications and tags	2012-02-15 00:34:22 +08:00
layouts	Merge branch 'master' into ldap	2012-04-12 18:50:48 +08:00
.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00