Roundcubemail devel
parent: 799d72 | patch | commitdiff
Aleksander Machniak
2012-05-21 9a2de8411ecb66e3df2fae5e65f0251b7c25173f
refs
author Aleksander Machniak <alec@alec.pl>
Monday, May 21, 2012 11:53 -0400
committer Aleksander Machniak <alec@alec.pl>
Monday, May 21, 2012 11:53 -0400
commit9a2de8411ecb66e3df2fae5e65f0251b7c25173f
tree b408046bf6312026017ef1ee9dd5d268d6ae641c tree | zip | gz
parent 799d72b8233897b7ca1bb1db81662ddd3e9912c5 view | diff
3c5489ba7547c88ba0f82b6ea0574d1a7185f416 view | diff 
Merge branch 'courier-fix'

Conflicts:
	CHANGELOG
5 files modified
130 ■■■■■ changed files
CHANGELOG 1 ●●●●● diff | view | raw | blame | history
config/main.inc.php.dist 4 ●●●●● diff | view | raw | blame | history
plugins/subscriptions_option/package.xml 4 ●●●●● diff | view | raw | blame | history
plugins/subscriptions_option/subscriptions_option.php 7 ●●●●● diff | view | raw | blame | history
program/include/rcube_imap.php 114 ●●●●● diff | view | raw | blame | history