githubFork/roundcubemail.git

Roundcubemail devel

Aleksander Machniak

2016-05-04 de14ec6aa0dd41f6d414da93bf83b52783e48632

refs
author	Aleksander Machniak <alec@alec.pl>
	Wednesday, May 4, 2016 02:53 -0400
committer	Aleksander Machniak <alec@alec.pl>
	Wednesday, May 4, 2016 02:53 -0400
commit	de14ec6aa0dd41f6d414da93bf83b52783e48632
tree	eb4fa6b8204eda3900682f7d90cdfbe59ca8fee8 tree \| zip \| gz
parent	9796cd2063770a8562d58d6492fd6904cdeb4627 view \| diff e499a14e13f37aa2031fe7443e5dcd04018aac58 view \| diff

Merge branch 'for-1.3'

Conflicts:
	CHANGELOG

1 files added

10 files modified

	CHANGELOG	3 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/Changelog	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/composer.json	2 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php	99 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/lib/Roundcube/rcube_sieve_script.php	108 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/localization/en_US.inc	14 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/managesieve.js	23 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/skins/classic/managesieve.css	16 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/skins/classic/managesieve_mail.css	2 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/skins/larry/managesieve.css	18 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_duplicate	16 ●●●●● diff \| view \| raw \| blame \| history