githubFork/roundcubemail.git

Roundcubemail devel

Aleksander Machniak

2015-02-19 50b04366ee7472272e2576d17c609e1d26345221

refs
author	Aleksander Machniak <alec@alec.pl>
	Thursday, February 19, 2015 04:25 -0500
committer	Aleksander Machniak <alec@alec.pl>
	Thursday, February 19, 2015 04:25 -0500
commit	50b04366ee7472272e2576d17c609e1d26345221
tree	7cdd9dfa14f47487c0ea2c4b9d6d73ecd1067f97 tree \| zip \| gz
parent	81d4ff214e7cf2253c270a8f8de533bebbf88c15 view \| diff 3665d1e8ece98ea2093d464087b2cd856df73bd6 view \| diff

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

Conflicts:
	CHANGELOG

7 files modified

	CHANGELOG	2 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/Changelog	2 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php	98 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcmail.php	8 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_plugin_api.php	47 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/sendmail.inc	14 ●●●●● diff \| view \| raw \| blame \| history