githubFork/roundcubemail.git

Roundcubemail devel

Aleksander Machniak

2014-06-10 1b988f9574c47fe110cc91364a58677f794b5b83

refs
author	Aleksander Machniak <alec@alec.pl>
	Tuesday, June 10, 2014 09:11 -0400
committer	Aleksander Machniak <alec@alec.pl>
	Tuesday, June 10, 2014 09:11 -0400
commit	1b988f9574c47fe110cc91364a58677f794b5b83
tree	ade8e3352deb890ba0840a8af80e93c2fcb98e3b tree \| zip \| gz
parent	4a051cd99f6768e634ba21a0a49f1212b9b19832 view \| diff 12514266b94269eebf399cb6052687762f370e9d view \| diff

Merge branch 'master' of https://github.com/simonpl/roundcubemail into simonpl-master

Conflicts:
	CHANGELOG

4 files modified

	CHANGELOG	1 ●●●●● diff \| view \| raw \| blame \| history
	plugins/password/config.inc.php.dist	3 ●●●●● diff \| view \| raw \| blame \| history
	plugins/password/localization/en_US.inc	1 ●●●●● diff \| view \| raw \| blame \| history
	plugins/password/password.php	78 ●●●●● diff \| view \| raw \| blame \| history