diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-05 12:52:20 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-05 12:52:20 -0300 |
| commit | 702f37e055d15028c97195303d60dd209b13a60a (patch) | |
| tree | cf344adeffdf56a54f12e30f10d9afc2c8057020 /parabola-keyring/.directory | |
| parent | 177ca49a40c9afdcad8bfbc7492c9f1a49d686ba (diff) | |
| parent | 6af067f7fc3eb71b4cc7549999f3dd623afacb53 (diff) | |
Merge branch 'master' of ../hackers
Conflicts:
authorized_keys
Diffstat (limited to 'parabola-keyring/.directory')
| -rw-r--r-- | parabola-keyring/.directory | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/parabola-keyring/.directory b/parabola-keyring/.directory new file mode 100644 index 0000000..d8a1780 --- /dev/null +++ b/parabola-keyring/.directory @@ -0,0 +1,3 @@ +[Dolphin] +Timestamp=2012,8,16,17,56,23 +Version=3 |