Roundcubemail devel
parent: 82d875 | patch | commitdiff
Aleksander Machniak
2012-11-15 8d54286df87e21673c05f091e38ca4de14aae326
refs
author Aleksander Machniak <alec@alec.pl>
Thursday, November 15, 2012 03:34 -0500
committer Aleksander Machniak <alec@alec.pl>
Thursday, November 15, 2012 03:34 -0500
commit8d54286df87e21673c05f091e38ca4de14aae326
tree d60c6d6765f5beafe4966352ebbd52e4c9c9661b tree | zip | gz
parent 82d875769cade12b82aeab6723c869d87fb7a4c9 view | diff
f226549d4f8f258deca9e165ef857252b79d2ee0 view | diff 
Merge branch 'keep-alive'

Conflicts:
	CHANGELOG
16 files modified
282 ■■■■■ changed files
CHANGELOG 3 ●●●●● diff | view | raw | blame | history
config/main.inc.php.dist 13 ●●●●● diff | view | raw | blame | history
index.php 7 ●●●●● diff | view | raw | blame | history
installer/rcube_install.php 3 ●●●●● diff | view | raw | blame | history
program/include/rcmail.php 16 ●●●●● diff | view | raw | blame | history
program/include/rcube.php 30 ●●●●● diff | view | raw | blame | history
program/include/rcube_config.php 2 ●●●●● diff | view | raw | blame | history
program/include/rcube_plugin_api.php 2 ●●●●● diff | view | raw | blame | history
program/include/rcube_session.php 20 ●●●●● diff | view | raw | blame | history
program/js/app.js 109 ●●●●● diff | view | raw | blame | history
program/localization/en_US/labels.inc 2 ●●●●● diff | view | raw | blame | history
program/localization/en_US/messages.inc 1 ●●●●● diff | view | raw | blame | history
program/steps/mail/check_recent.inc 10 ●●●●● diff | view | raw | blame | history
program/steps/mail/func.inc 1 ●●●●● diff | view | raw | blame | history
program/steps/settings/func.inc 35 ●●●●● diff | view | raw | blame | history
program/steps/settings/save_prefs.inc 28 ●●●●● diff | view | raw | blame | history