Christophe Vilayphiou ad9ac5f3f7 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard ... Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb		2012-05-16 01:31:16 +08:00
..
assets	Fix commit error	2012-05-15 21:25:51 +08:00
controllers	Add impressionist	2012-05-15 21:26:09 +08:00
helpers	Add impressionist	2012-05-15 21:26:09 +08:00
jobs	Restart job	2012-05-14 00:50:36 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	Add impressionist	2012-05-15 21:26:09 +08:00
uploaders	Modifications for images in html code	2011-10-18 11:21:24 +08:00
views	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-05-16 01:31:16 +08:00