summaryrefslogtreecommitdiff
path: root/parabola-keyring/parabola-keyring-2013.05.10.png
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2013-12-27 20:09:16 -0300
committerNicolás Reynolds <fauno@endefensadelsl.org>2013-12-27 20:09:16 -0300
commit36537a04baaa5c6d7e4d6acc6924231d55a95b01 (patch)
treecd4402474d8f536192bc49eec6bebc0e7f5d77fe /parabola-keyring/parabola-keyring-2013.05.10.png
parentff8ae8ceba55a43cfb5f763f75d9679c31c38a63 (diff)
parent76571cb2dc2644e9eb23758cd8da6d281d573994 (diff)
Merge git://repo.hackcoop.com.ar/hacking
Conflicts: authorized_keys parabola-keyring/Makefile parabola-keyring/packager-keyids parabola-keyring/packager/aurelien.asc parabola-keyring/packager/brendan.asc parabola-keyring/packager/coadde.asc parabola-keyring/packager/emulatorman.asc parabola-keyring/packager/encyclomundi.asc parabola-keyring/packager/fauno.asc parabola-keyring/packager/jorginho.asc parabola-keyring/packager/lukeshu.asc parabola-keyring/packager/mtjm.asc parabola-keyring/packager/ovruni.asc parabola-keyring/packager/shackra.asc parabola-keyring/packager/smv.asc parabola-keyring/packager/xihh.asc parabola-keyring/parabola-trusted parabola-keyring/parabola.gpg parabola-keyring/update-keys
Diffstat (limited to 'parabola-keyring/parabola-keyring-2013.05.10.png')
0 files changed, 0 insertions, 0 deletions