Merge branch 'v1.1'

This commit is contained in:
nuxsmin
2015-02-03 13:30:39 +01:00
parent e866f37185
commit cd1072d2de
77 changed files with 4507 additions and 1857 deletions

View File

@@ -2,8 +2,8 @@
/**
* sysPass
*
* @author nuxsmin
* @link http://syspass.org
* @author nuxsmin
* @link http://syspass.org
* @copyright 2012-2015 Rubén Domínguez nuxsmin@syspass.org
*
* This file is part of sysPass.