githubFork/roundcubemail.git

Roundcubemail devel

Aleksander Machniak

2012-08-29 0062becea70392c4a21f3ef8367f65e93d2c1f67

refs
author	Aleksander Machniak <alec@alec.pl>
	Wednesday, August 29, 2012 02:34 -0400
committer	Aleksander Machniak <alec@alec.pl>
	Wednesday, August 29, 2012 02:34 -0400
commit	0062becea70392c4a21f3ef8367f65e93d2c1f67
tree	93595c3a8f765124d9674da8a9623186dddaf874 tree \| zip \| gz
parent	46d0012e26d18b1a780ff71cd8aa2f04e6c4a11b view \| diff b7d33e35186d47dcd3609e1ef97cdb011c6f82f6 view \| diff

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

Conflicts:
	CHANGELOG

5 files modified

	CHANGELOG	1 ●●●●● diff \| view \| raw \| blame \| history
	plugins/acl/acl.php	3 ●●●●● diff \| view \| raw \| blame \| history
	plugins/acl/skins/larry/acl.css	4 ●●●●● diff \| view \| raw \| blame \| history
	plugins/acl/skins/larry/templates/table.html	8 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_output_html.php	31 ●●●●● diff \| view \| raw \| blame \| history