Roundcubemail devel
parent: 9a0153 | patch | commitdiff
Aleksander Machniak
2013-12-15 acfbe5ff4c71bf6cd9d5fda27eb93406f140b23f
refs
author Aleksander Machniak <alec@alec.pl>
Sunday, December 15, 2013 04:02 -0500
committer Aleksander Machniak <alec@alec.pl>
Sunday, December 15, 2013 04:02 -0500
commitacfbe5ff4c71bf6cd9d5fda27eb93406f140b23f
tree 5ee176e0739f5418853e4e6a378e29d9b91cde22 tree | zip | gz
parent 9a0153324eeb1f0e808cb1a063d1f37d49ad48e2 view | diff
2dade15d83b9d0b105fcb35c9edd62bfeceece16 view | diff 
Merge branch 'master' of github.com:roundcube/roundcubemail

Conflicts:
	CHANGELOG
2 files modified
27 ■■■■■ changed files
.htaccess 26 ●●●●● diff | view | raw | blame | history
CHANGELOG 1 ●●●●● diff | view | raw | blame | history