diff options
| author | Joey Hess <joeyh@joeyh.name> | 2014-12-17 16:31:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-17 16:31:09 -0400 |
| commit | 8cc691dc868f1f43d985fea012dc84183b70341d (patch) | |
| tree | ab8485a66aa75c15e7dfdd2f00ab6011786e6b2d /debian | |
| parent | db3f9050d6f4a098b82ae014a6a6e5e96a3067f6 (diff) | |
| parent | ddeee3ceb8ef5aa94ffc0696bff085eb031309d6 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/privdata.gpg
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 46d28b53..af964774 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -propellor (1.2.1) UNRELEASED; urgency=medium +propellor (1.2.1) unstable; urgency=medium * Added CryptPassword to PrivDataField, for password hashes as produced by crypt(3). * User.hasPassword and User.hasSomePassword will now use either a CryptPassword or a Password from privdata, depending on which is set. - -- Joey Hess <id@joeyh.name> Sun, 14 Dec 2014 13:51:01 -0400 + -- Joey Hess <id@joeyh.name> Wed, 17 Dec 2014 16:30:44 -0400 propellor (1.2.0) unstable; urgency=medium |