Roundcubemail devel
parent: 9cb76a | patch | commitdiff
Aleksander Machniak
2012-08-21 74d7841c2643434fbd3e8759f160bda05f82ab0d
refs
author Aleksander Machniak <alec@alec.pl>
Tuesday, August 21, 2012 05:23 -0400
committer Aleksander Machniak <alec@alec.pl>
Tuesday, August 21, 2012 05:23 -0400
commit74d7841c2643434fbd3e8759f160bda05f82ab0d
tree 8d94c1e21d9b2c103f52d13e1ea0a0d7f64a1a70 tree | zip | gz
parent 9cb76ad3c2ebcf6f75053de2e686390470dce7ba view | diff
ae7027de029e28fdd3894efe919b6171b2b11eab view | diff 
Merge branch 'master' of github.com:roundcube/roundcubemail

Conflicts:
	CHANGELOG
1 files added
14 files modified
132 ■■■■■ changed files
CHANGELOG 2 ●●●●● diff | view | raw | blame | history
config/main.inc.php.dist 7 ●●●●● diff | view | raw | blame | history
program/include/rcube.php 5 ●●●●● diff | view | raw | blame | history
program/include/rcube_output_html.php 5 ●●●●● diff | view | raw | blame | history
program/include/rcube_utils.php 5 ●●●●● diff | view | raw | blame | history
program/js/app.js 8 ●●●●● diff | view | raw | blame | history
program/js/common.js 1 ●●●●● diff | view | raw | blame | history
program/js/googiespell.js 4 ●●●●● diff | view | raw | blame | history
program/localization/en_US/labels.inc 5 ●●●●● diff | view | raw | blame | history
program/localization/pl_PL/labels.inc 1 ●●●●● diff | view | raw | blame | history
program/steps/mail/func.inc 4 ●●●●● diff | view | raw | blame | history
skins/classic/splitter.js 4 ●●●●● diff | view | raw | blame | history
skins/larry/ui.js 6 ●●●●● diff | view | raw | blame | history
tests/Utils.php 74 ●●●●● diff | view | raw | blame | history
tests/phpunit.xml 1 ●●●●● diff | view | raw | blame | history