aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-03-06 14:00:29 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-03-06 14:00:29 -0300
commit8e4e3e5e1b0ffaf86627543e9d58dc69c6f22aac (patch)
tree9efb561ecb0c6fb6a513828949706eeba90d2478 /templates
parent91bb84fd086baaaa60454880e52075ae1c8e0dbe (diff)
parent66812bcf7655bf22aafe58d8d60c96a03114bf0b (diff)
downloadkeyringer-8e4e3e5e1b0ffaf86627543e9d58dc69c6f22aac.tar.gz
keyringer-8e4e3e5e1b0ffaf86627543e9d58dc69c6f22aac.tar.bz2
Merge branch 'master' into canary
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions