githubFork/roundcubemail.git

Roundcubemail devel

Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2013-06-19 3bbe4e7424f12b4f870fb775b8230714a2862380

refs
author	Aleksander Machniak <alec@alec.pl>
	Wednesday, June 19, 2013 13:52 -0400
committer	Aleksander Machniak <alec@alec.pl>
	Wednesday, June 19, 2013 13:52 -0400
commit	3bbe4e7424f12b4f870fb775b8230714a2862380
tree	925ee90ecc269ed5fad0426efed4e741ca3f3cd7 tree \| zip \| gz
parent	cd9e4154060ff38226e77eea82123519322b2327 view \| diff b200258d5af08ff24065d58c96d8ccf834d1ffad view \| diff

Merge branch 'master' of github.com:roundcube/roundcubemail

4 files added

32 files modified

	CHANGELOG	8 ●●●●● diff \| view \| raw \| blame \| history
	config/main.inc.php.dist	57 ●●●●● diff \| view \| raw \| blame \| history
	installer/check.php	6 ●●●●● diff \| view \| raw \| blame \| history
	installer/rcube_install.php	7 ●●●●● diff \| view \| raw \| blame \| history
	plugins/acl/acl.php	1 ●●●●● diff \| view \| raw \| blame \| history
	plugins/acl/config.inc.php.dist	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/attachment_reminder.php	8 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcmail.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/js/app.js	114 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_config.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_ldap.php	1129 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_ldap_generic.php	1049 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_ldap_result.php	130 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_vcard.php	10 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/en_US/labels.inc	1 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/func.inc	66 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/list.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/save.inc	4 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/show.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/list_contacts.inc	29 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/addressbook.css	31 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/functions.js	1 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/images/contactgroup.png	diff \| view \| raw \| blame \| history
	skins/classic/mail.css	11 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/templates/addressbook.html	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/templates/contact.html	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/templates/mail.html	5 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/addressbook.css	49 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/ie7hacks.css	1 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/images/contactgroup.png	diff \| view \| raw \| blame \| history
	skins/larry/images/listicons.png	diff \| view \| raw \| blame \| history
	skins/larry/mail.css	13 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/styles.css	4 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/templates/addressbook.html	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/templates/contact.html	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/ui.js	33 ●●●●● diff \| view \| raw \| blame \| history