githubFork/roundcubemail.git

Roundcubemail devel

prashant

2015-06-23 521bea4bd8f2e462df3cf79fa5f2230a00e1115c

refs
author	prashant <prashant@jois.ca>
	Tuesday, June 23, 2015 18:09 -0400
committer	prashant <prashant@jois.ca>
	Tuesday, June 23, 2015 18:09 -0400
commit	521bea4bd8f2e462df3cf79fa5f2230a00e1115c
tree	45c01079bef8cb6ad7c385ece0b471e9e78c7330 tree \| zip \| gz
parent	e8e103202363790da8dd45c6076eb5561d64592a view \| diff 56a4e1512c06a27ab8abd71b6327e8ec62ad91b5 view \| diff

Merge branch 'master' of https://github.com/roundcube/roundcubemail

Conflicts:
	Dockerfile

11 files modified

	CHANGELOG	4 ●●●●● diff \| view \| raw \| blame \| history
	Dockerfile	4 ●●●●● diff \| view \| raw \| blame \| history
	composer.json-dist	12 ●●●●● diff \| view \| raw \| blame \| history
	plugins/filesystem_attachments/filesystem_attachments.php	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/redundant_attachments/redundant_attachments.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_html2text.php	9 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_message.php	65 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_smtp.php	12 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/compose.inc	349 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/settings.css	1 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Html2text.php	30 ●●●●● diff \| view \| raw \| blame \| history