]> err.no Git - pwstore/commitdiff
projects / pwstore / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a04ae4 6d8c35c)
Merge remote-tracking branch 'tollef/master'
authorPeter Palfrader <peter@palfrader.org>
Mon, 29 Jul 2013 09:30:57 +0000 (11:30 +0200)
committerPeter Palfrader <peter@palfrader.org>
Mon, 29 Jul 2013 09:30:57 +0000 (11:30 +0200)
* tollef/master:
  Use ./.keyring when learning key fingerprints too
  Fix up GROUP_PATTERN support so it allows multiple access items on a line
  Fix up formatting of queries, list keys

1  2 
pws patch | diff1 | diff2 | blob | history

diff --cc pws
Simple merge
Unnamed repository; edit this file 'description' to name the repository.