Skip to content
Snippets Groups Projects
Commit ce9aa55c authored by Jan-Tarek Butt's avatar Jan-Tarek Butt
Browse files

Merge branch 'master' into 'master'

Master

add pubkeys pic

See merge request !5
parents 47d4251d 17732f12
No related branches found
No related tags found
No related merge requests found
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
'5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata '5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
'0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk '0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
'1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6 '1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6
'564d897c81cf35b6c7a896513834fd8886cbe3c55efbeba8e8d5bbf9ff0d8dbe', --pic
}, },
}, },
testing = { testing = {
...@@ -123,6 +124,7 @@ ...@@ -123,6 +124,7 @@
'5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata '5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
'0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk '0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
'1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6 '1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6
'564d897c81cf35b6c7a896513834fd8886cbe3c55efbeba8e8d5bbf9ff0d8dbe', --pic
}, },
}, },
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment