jvelilla d0fda6de66 Merge branch 'master' of https://github.com/EiffelWebFramework/EWF ...

Conflicts:
	draft/application/cms/cms.ecf
	draft/application/cms/example/src/web_cms.e
	draft/application/cms/src/cms_configuration.e
	draft/application/cms/src/cms_default_setup.e
	draft/application/cms/src/cms_service.e
	draft/application/cms/src/cms_setup.e
	draft/application/cms/src/handler/cms_file_system_handler.e
	draft/application/cms/src/kernel/content/format/filters/cms_html_filter.e
	draft/application/cms/src/modules/debug/debug_module.e
	draft/application/cms/src/notification/cms_email.e
	draft/application/cms/src/notification/cms_storage_mailer.e
	draft/application/cms/src/storage/cms_sed_storage.e
	draft/application/cms/src/storage/cms_storage.e
	library/runtime/process/notification_email/notification_external_mailer.e
	tools/bin/ecf_updater.exe

2013-06-18 09:56:53 -03:00

..

example

Merge branch 'master' of https://github.com/EiffelWebFramework/EWF

2013-06-18 09:56:53 -03:00

src

Merge branch 'master' of https://github.com/EiffelWebFramework/EWF

2013-06-18 09:56:53 -03:00

www/themes/test/res

merge

2013-06-11 11:33:27 -03:00

cms-safe.ecf

Rename notification to notification_email

2013-06-12 13:55:14 +02:00

cms.ecf

Rename notification to notification_email

2013-06-12 13:55:14 +02:00