githubFork/roundcubemail.git

Roundcubemail devel

Aleksander Machniak

2012-06-13 21be27273c6fb74456b187018dc2584a4514a502

refs
author	Aleksander Machniak <alec@alec.pl>
	Wednesday, June 13, 2012 06:14 -0400
committer	Aleksander Machniak <alec@alec.pl>
	Wednesday, June 13, 2012 06:14 -0400
commit	21be27273c6fb74456b187018dc2584a4514a502
tree	0b16d93aad5bb295f488daafbfa874b590a278a5 tree \| zip \| gz
parent	7456c27b47937d05fee84881e50dec66853975fa view \| diff 64584be909914b8eb3fa0e1e8681b6883ba25244 view \| diff

Merge branch 'release-0.8' of github.com:roundcube/roundcubemail into release-0.8

Conflicts:
	CHANGELOG

7 files modified

	CHANGELOG	2 ●●●●● diff \| view \| raw \| blame \| history
	SQL/mssql.upgrade.sql	4 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_vcard.php	5 ●●●●● diff \| view \| raw \| blame \| history
	program/js/app.js	2 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Mail/mime.php	16 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Mail/mimePart.php	53 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/mail.css	1 ●●●●● diff \| view \| raw \| blame \| history