diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 20:09:16 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 20:09:16 -0300 |
| commit | 36537a04baaa5c6d7e4d6acc6924231d55a95b01 (patch) | |
| tree | cd4402474d8f536192bc49eec6bebc0e7f5d77fe /parabola-keyring | |
| parent | ff8ae8ceba55a43cfb5f763f75d9679c31c38a63 (diff) | |
| parent | 76571cb2dc2644e9eb23758cd8da6d281d573994 (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')
| -rw-r--r-- | parabola-keyring/.directory | 3 | ||||
| -rw-r--r-- | parabola-keyring/parabola-revoked | 0 |
2 files changed, 0 insertions, 3 deletions
diff --git a/parabola-keyring/.directory b/parabola-keyring/.directory deleted file mode 100644 index d8a1780..0000000 --- a/parabola-keyring/.directory +++ /dev/null @@ -1,3 +0,0 @@ -[Dolphin] -Timestamp=2012,8,16,17,56,23 -Version=3 diff --git a/parabola-keyring/parabola-revoked b/parabola-keyring/parabola-revoked deleted file mode 100644 index e69de29..0000000 --- a/parabola-keyring/parabola-revoked +++ /dev/null |