githubFork/roundcubemail.git

Roundcubemail devel

Thomas Bruederli

2013-10-25 98b7b548a229600f7653cd67d9aae43675938143

refs
author	Thomas Bruederli <thomas@roundcube.net>
	Friday, October 25, 2013 10:50 -0400
committer	Thomas Bruederli <thomas@roundcube.net>
	Friday, October 25, 2013 10:50 -0400
commit	98b7b548a229600f7653cd67d9aae43675938143
tree	15c141db332b9ae87ef3fbf573ea32d30dc1ea76 tree \| zip \| gz
parent	4e4c2511bc00cfc0214acab63b097efe142187a7 view \| diff 9c41ba3c9ebbb14d01abe961c420f71f9463e61a view \| diff

Merge branch 'dev-canned-responses'

Conflicts (resolved):
	skins/classic/includes/settingstabs.html
	skins/larry/includes/settingstabs.html

6 files added

21 files modified

	config/defaults.inc.php	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	293 ●●●●● 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/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/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/mail.css	4 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/settings.css	12 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/styles.css	39 ●●●●● 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