Files
sysPass/inc/Crypt.class.php
nuxsmin 98dbe40834 Merge branch 'master' into devel
Conflicts:
	inc/locales/en_US/LC_MESSAGES/messages.mo
	inc/locales/en_US/LC_MESSAGES/messages.po
2015-10-12 12:46:21 +02:00

8.2 KiB