githubFork/roundcubemail.git

Roundcubemail devel

Merge branch 'release-0.9-canned-responses' into release-0.9-kolab-ucs

Thomas

2014-01-15 b491936eba52fe1e31b0cc8edc775575382a6e96

refs
author	Thomas <thomas@roundcube.net>
	Wednesday, January 15, 2014 03:16 -0500
committer	Thomas <thomas@roundcube.net>
	Wednesday, January 15, 2014 03:16 -0500
commit	b491936eba52fe1e31b0cc8edc775575382a6e96
tree	74742453fde03b2d49f390a0f7fc4d853304330d tree \| zip \| gz
parent	5b3e568036be1d349ab47bf896d81285c8e02a5e view \| diff a3b85d7b8560cdc1057fcaffa3acbd247b4b5b7a view \| diff

Merge branch 'release-0.9-canned-responses' into release-0.9-kolab-ucs

27 files modified

6 files added

	config/main.inc.php.dist	6 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcmail.php	38 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcmail_output_html.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/js/app.js	305 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/html.php	6 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_user.php	12 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/de_CH/labels.inc	9 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/de_CH/messages.inc	2 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/de_DE/labels.inc	9 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/de_DE/messages.inc	2 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/en_US/labels.inc	9 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/en_US/messages.inc	2 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/compose.inc	36 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/edit_response.inc	107 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/func.inc	3 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/responses.inc	128 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/common.css	29 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/images/mail_toolbar.png	diff \| view \| raw \| blame \| history
	skins/classic/includes/settingstabs.html	1 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/mail.css	4 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/settings.css	20 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/templates/compose.html	11 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/templates/responseedit.html	24 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/templates/responses.html	46 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/images/buttons.png	diff \| view \| raw \| blame \| history
	skins/larry/images/listicons.png	diff \| view \| raw \| blame \| history
	skins/larry/includes/settingstabs.html	1 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/mail.css	4 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/settings.css	12 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/styles.css	36 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/templates/compose.html	11 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/templates/responseedit.html	22 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/templates/responses.html	41 ●●●●● diff \| view \| raw \| blame \| history