Roundcubemail devel
parent: 99dafc | patch | commitdiff
Aleksander Machniak
2015-02-22 334eb48cfe87ad6bbb98a3da54727d12431ca872
refs
author Aleksander Machniak <alec@alec.pl>
Sunday, February 22, 2015 04:47 -0500
committer Aleksander Machniak <alec@alec.pl>
Sunday, February 22, 2015 04:47 -0500
commit334eb48cfe87ad6bbb98a3da54727d12431ca872
tree 02d6e6373433c40063ed6a19d3bc2166596c2180 tree | zip | gz
parent 99dafc41a371f393d4af9c99abab320836345250 view | diff
bec8735d6642a66885922edcd1685a4b98152009 view | diff 
Merge branch 'release-1.1' of github.com:roundcube/roundcubemail into release-1.1

Conflicts:
	CHANGELOG
3 files modified
27 ■■■■■ changed files
plugins/acl/acl.php 2 ●●●●● diff | view | raw | blame | history
program/lib/Roundcube/rcube_db_mysql.php 23 ●●●●● diff | view | raw | blame | history
program/steps/mail/get.inc 2 ●●●●● diff | view | raw | blame | history